From 2c568de11510b453f499827919964badef22304e Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 31 Dec 2018 23:52:58 -0600 Subject: Import code from old v4 repo --- src/Samples/bafunctions/Readme.txt | 85 + src/Samples/bafunctions/WixSampleBAFunctions.cpp | 95 + src/Samples/bafunctions/bafunctions.cpp | 46 + src/Samples/bafunctions/bafunctions.def | 6 + src/Samples/bafunctions/bafunctions.rc | 118 + src/Samples/bafunctions/bafunctions.vcxproj | 54 + src/Samples/bafunctions/bafunctionsver.h | 13 + src/Samples/bafunctions/precomp.h | 47 + src/Samples/bafunctions/resource.h | 15 + src/mbahost/host.cpp | 656 ++++ src/mbahost/host.def | 6 + src/mbahost/host.vcxproj | 51 + src/mbahost/precomp.h | 25 + src/wixext/BalBinder.cs | 125 + src/wixext/BalCompiler.cs | 562 +++ src/wixext/BalExtensionData.cs | 55 + src/wixext/WixBalExtension.csproj | 47 + src/wixext/bal.xsd | 266 ++ src/wixext/messages.xml | 43 + src/wixext/tables.xml | 41 + src/wixlib/BalExtension.wixproj | 39 + src/wixlib/BalExtension.wxs | 8 + src/wixlib/Mba.wxs | 78 + src/wixlib/NetFx451AsPrereq.wxs | 34 + src/wixlib/NetFx452AsPrereq.wxs | 34 + src/wixlib/NetFx45AsPrereq.wxs | 34 + src/wixlib/NetFx461AsPrereq.wxs | 34 + src/wixlib/NetFx462AsPrereq.wxs | 34 + src/wixlib/NetFx46AsPrereq.wxs | 34 + src/wixlib/NetFx4AsPrereq.wxs | 71 + src/wixlib/wixstdba.wxs | 93 + src/wixlib/wixstdba_platform.wxi | 41 + src/wixlib/wixstdba_x86.wxs | 8 + src/wixstdba/Resources/1028/mbapreq.wxl | 27 + src/wixstdba/Resources/1029/mbapreq.wxl | 30 + src/wixstdba/Resources/1030/mbapreq.wxl | 30 + src/wixstdba/Resources/1031/mbapreq.wxl | 33 + src/wixstdba/Resources/1032/mbapreq.wxl | 32 + src/wixstdba/Resources/1035/mbapreq.wxl | 30 + src/wixstdba/Resources/1036/mbapreq.wxl | 30 + src/wixstdba/Resources/1038/mbapreq.wxl | 30 + src/wixstdba/Resources/1040/mbapreq.wxl | 31 + src/wixstdba/Resources/1041/mbapreq.wxl | 27 + src/wixstdba/Resources/1042/mbapreq.wxl | 27 + src/wixstdba/Resources/1043/mbapreq.wxl | 30 + src/wixstdba/Resources/1044/mbapreq.wxl | 30 + src/wixstdba/Resources/1045/mbapreq.wxl | 30 + src/wixstdba/Resources/1046/mbapreq.wxl | 29 + src/wixstdba/Resources/1049/mbapreq.wxl | 29 + src/wixstdba/Resources/1051/mbapreq.wxl | 30 + src/wixstdba/Resources/1053/mbapreq.wxl | 30 + src/wixstdba/Resources/1055/mbapreq.wxl | 30 + src/wixstdba/Resources/1060/mbapreq.wxl | 30 + src/wixstdba/Resources/2052/mbapreq.wxl | 27 + src/wixstdba/Resources/2070/mbapreq.wxl | 29 + src/wixstdba/Resources/3082/mbapreq.wxl | 31 + src/wixstdba/Resources/HyperlinkLargeTheme.xml | 109 + src/wixstdba/Resources/HyperlinkSidebarTheme.xml | 120 + src/wixstdba/Resources/HyperlinkTheme.wxl | 61 + src/wixstdba/Resources/HyperlinkTheme.xml | 106 + src/wixstdba/Resources/LoremIpsumLicense.rtf | Bin 0 -> 4908 bytes src/wixstdba/Resources/RtfLargeTheme.xml | 108 + src/wixstdba/Resources/RtfTheme.wxl | 58 + src/wixstdba/Resources/RtfTheme.xml | 106 + src/wixstdba/Resources/logo.png | Bin 0 -> 852 bytes src/wixstdba/Resources/logoSide.png | Bin 0 -> 3477 bytes src/wixstdba/Resources/mbapreq.png | Bin 0 -> 797 bytes src/wixstdba/Resources/mbapreq.thm | 47 + src/wixstdba/Resources/mbapreq.wxl | 29 + .../WixStandardBootstrapperApplication.cpp | 3849 ++++++++++++++++++++ src/wixstdba/precomp.h | 51 + src/wixstdba/resource.h | 15 + src/wixstdba/wixstdba.cpp | 78 + src/wixstdba/wixstdba.def | 8 + src/wixstdba/wixstdba.mc | 73 + src/wixstdba/wixstdba.vcxproj | 106 + 76 files changed, 8504 insertions(+) create mode 100644 src/Samples/bafunctions/Readme.txt create mode 100644 src/Samples/bafunctions/WixSampleBAFunctions.cpp create mode 100644 src/Samples/bafunctions/bafunctions.cpp create mode 100644 src/Samples/bafunctions/bafunctions.def create mode 100644 src/Samples/bafunctions/bafunctions.rc create mode 100644 src/Samples/bafunctions/bafunctions.vcxproj create mode 100644 src/Samples/bafunctions/bafunctionsver.h create mode 100644 src/Samples/bafunctions/precomp.h create mode 100644 src/Samples/bafunctions/resource.h create mode 100644 src/mbahost/host.cpp create mode 100644 src/mbahost/host.def create mode 100644 src/mbahost/host.vcxproj create mode 100644 src/mbahost/precomp.h create mode 100644 src/wixext/BalBinder.cs create mode 100644 src/wixext/BalCompiler.cs create mode 100644 src/wixext/BalExtensionData.cs create mode 100644 src/wixext/WixBalExtension.csproj create mode 100644 src/wixext/bal.xsd create mode 100644 src/wixext/messages.xml create mode 100644 src/wixext/tables.xml create mode 100644 src/wixlib/BalExtension.wixproj create mode 100644 src/wixlib/BalExtension.wxs create mode 100644 src/wixlib/Mba.wxs create mode 100644 src/wixlib/NetFx451AsPrereq.wxs create mode 100644 src/wixlib/NetFx452AsPrereq.wxs create mode 100644 src/wixlib/NetFx45AsPrereq.wxs create mode 100644 src/wixlib/NetFx461AsPrereq.wxs create mode 100644 src/wixlib/NetFx462AsPrereq.wxs create mode 100644 src/wixlib/NetFx46AsPrereq.wxs create mode 100644 src/wixlib/NetFx4AsPrereq.wxs create mode 100644 src/wixlib/wixstdba.wxs create mode 100644 src/wixlib/wixstdba_platform.wxi create mode 100644 src/wixlib/wixstdba_x86.wxs create mode 100644 src/wixstdba/Resources/1028/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1029/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1030/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1031/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1032/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1035/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1036/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1038/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1040/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1041/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1042/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1043/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1044/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1045/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1046/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1049/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1051/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1053/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1055/mbapreq.wxl create mode 100644 src/wixstdba/Resources/1060/mbapreq.wxl create mode 100644 src/wixstdba/Resources/2052/mbapreq.wxl create mode 100644 src/wixstdba/Resources/2070/mbapreq.wxl create mode 100644 src/wixstdba/Resources/3082/mbapreq.wxl create mode 100644 src/wixstdba/Resources/HyperlinkLargeTheme.xml create mode 100644 src/wixstdba/Resources/HyperlinkSidebarTheme.xml create mode 100644 src/wixstdba/Resources/HyperlinkTheme.wxl create mode 100644 src/wixstdba/Resources/HyperlinkTheme.xml create mode 100644 src/wixstdba/Resources/LoremIpsumLicense.rtf create mode 100644 src/wixstdba/Resources/RtfLargeTheme.xml create mode 100644 src/wixstdba/Resources/RtfTheme.wxl create mode 100644 src/wixstdba/Resources/RtfTheme.xml create mode 100644 src/wixstdba/Resources/logo.png create mode 100644 src/wixstdba/Resources/logoSide.png create mode 100644 src/wixstdba/Resources/mbapreq.png create mode 100644 src/wixstdba/Resources/mbapreq.thm create mode 100644 src/wixstdba/Resources/mbapreq.wxl create mode 100644 src/wixstdba/WixStandardBootstrapperApplication.cpp create mode 100644 src/wixstdba/precomp.h create mode 100644 src/wixstdba/resource.h create mode 100644 src/wixstdba/wixstdba.cpp create mode 100644 src/wixstdba/wixstdba.def create mode 100644 src/wixstdba/wixstdba.mc create mode 100644 src/wixstdba/wixstdba.vcxproj (limited to 'src') diff --git a/src/Samples/bafunctions/Readme.txt b/src/Samples/bafunctions/Readme.txt new file mode 100644 index 00000000..517d0d4c --- /dev/null +++ b/src/Samples/bafunctions/Readme.txt @@ -0,0 +1,85 @@ + +This is a sample project showing how to create a BA function assembly. + +The four interfaces are in the WixSampleBAFunctions.cpp file. + + +Example code: +~~~~~~~~~~~~~ + + + HRESULT hr = S_OK; + HKEY hkKey = NULL; + LPWSTR sczValue = NULL; + LPWSTR sczFormatedValue = NULL; + + + //--------------------------------------------------------------------------------------------- + // Example of BA function failure + hr = E_NOTIMPL; + BalExitOnFailure(hr, "Test failure."); + //--------------------------------------------------------------------------------------------- + + //--------------------------------------------------------------------------------------------- + // Example of setting a variables + hr = m_pEngine->SetVariableString(L"Variable1", L"String value"); + BalExitOnFailure(hr, "Failed to set variable."); + hr = m_pEngine->SetVariableNumeric(L"Variable2", 1234); + BalExitOnFailure(hr, "Failed to set variable."); + //--------------------------------------------------------------------------------------------- + + //--------------------------------------------------------------------------------------------- + // Example of reading burn variable. + BalGetStringVariable(L"WixBundleName", &sczValue); + BalExitOnFailure(hr, "Failed to get variable."); + + hr = m_pEngine->SetVariableString(L"Variable4", sczValue); + BalExitOnFailure(hr, "Failed to set variable."); + //--------------------------------------------------------------------------------------------- + + ReleaseNullStr(sczValue); // Release string so it can be re-used + + //--------------------------------------------------------------------------------------------- + // Examples of reading burn variable and formatting it. + BalGetStringVariable(L"InstallFolder", &sczValue); + BalExitOnFailure(hr, "Failed to get variable."); + + hr = m_pEngine->SetVariableString(L"Variable5", sczValue); + BalExitOnFailure(hr, "Failed to set variable."); + + BalFormatString(sczValue, &sczFormatedValue); + BalExitOnFailure(hr, "Failed to format variable."); + + hr = m_pEngine->SetVariableString(L"Variable6", sczFormatedValue); + BalExitOnFailure(hr, "Failed to set variable."); + //--------------------------------------------------------------------------------------------- + + ReleaseNullStr(sczValue); // Release string so it can be re-used + + //--------------------------------------------------------------------------------------------- + // Example of reading 64 bit registry and setting the InstallFolder variable to the value read. + hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v3.5", KEY_READ | KEY_WOW64_64KEY, &hkKey); + BalExitOnFailure(hr, "Failed to open registry key."); + + hr = RegReadString(hkKey, L"InstallPath", &sczValue); + BalExitOnFailure(hr, "Failed to read registry value."); + + // Example of function call + PathBackslashTerminate(&sczValue); + + hr = m_pEngine->SetVariableString(L"InstallFolder", sczValue); + BalExitOnFailure(hr, "Failed to set variable."); + //--------------------------------------------------------------------------------------------- + + ReleaseNullStr(sczValue); // Release string so it can be re-used + + //--------------------------------------------------------------------------------------------- + // Example of calling a function that return HRESULT + hr = GetFileVersion(); + BalExitOnFailure(hr, "Failed to get version."); + //--------------------------------------------------------------------------------------------- + + LExit: + ReleaseRegKey(hkKey); + ReleaseStr(sczValue); + ReleaseStr(sczFormatedValue); diff --git a/src/Samples/bafunctions/WixSampleBAFunctions.cpp b/src/Samples/bafunctions/WixSampleBAFunctions.cpp new file mode 100644 index 00000000..531b86a3 --- /dev/null +++ b/src/Samples/bafunctions/WixSampleBAFunctions.cpp @@ -0,0 +1,95 @@ +// 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. + +#include "precomp.h" +#include "BalBaseBAFunctions.h" +#include "BalBaseBAFunctionsProc.h" + +class CWixSampleBAFunctions : public CBalBaseBAFunctions +{ +public: // IBootstrapperApplication + virtual STDMETHODIMP OnDetectBegin( + __in BOOL fInstalled, + __in DWORD cPackages, + __inout BOOL* pfCancel + ) + { + HRESULT hr = S_OK; + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Running detect begin BA function. fInstalled=%d, cPackages=%u, fCancel=%d", fInstalled, cPackages, *pfCancel); + + //------------------------------------------------------------------------------------------------- + // YOUR CODE GOES HERE + BalExitOnFailure(hr, "Change this message to represent real error handling."); + //------------------------------------------------------------------------------------------------- + + LExit: + return hr; + } + +public: // IBAFunctions + virtual STDMETHODIMP OnPlanBegin( + __in DWORD cPackages, + __inout BOOL* pfCancel + ) + { + HRESULT hr = S_OK; + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Running plan begin BA function. cPackages=%u, fCancel=%d", cPackages, *pfCancel); + + //------------------------------------------------------------------------------------------------- + // YOUR CODE GOES HERE + BalExitOnFailure(hr, "Change this message to represent real error handling."); + //------------------------------------------------------------------------------------------------- + + LExit: + return hr; + } + +public: + // + // Constructor - initialize member variables. + // + CWixSampleBAFunctions( + __in HMODULE hModule, + __in IBootstrapperEngine* pEngine, + __in const BA_FUNCTIONS_CREATE_ARGS* pArgs + ) : CBalBaseBAFunctions(hModule, pEngine, pArgs) + { + } + + // + // Destructor - release member variables. + // + ~CWixSampleBAFunctions() + { + } +}; + + +HRESULT WINAPI CreateBAFunctions( + __in HMODULE hModule, + __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, + __inout BA_FUNCTIONS_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + CWixSampleBAFunctions* pBAFunctions = NULL; + IBootstrapperEngine* pEngine = NULL; + + // This is required to enable logging functions. + hr = BalInitializeFromCreateArgs(pArgs->pBootstrapperCreateArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize Bal."); + + pBAFunctions = new CWixSampleBAFunctions(hModule, pEngine, pArgs); + ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CWixSampleBAFunctions object."); + + pResults->pfnBAFunctionsProc = BalBaseBAFunctionsProc; + pResults->pvBAFunctionsProcContext = pBAFunctions; + pBAFunctions = NULL; + +LExit: + ReleaseObject(pBAFunctions); + ReleaseObject(pEngine); + + return hr; +} diff --git a/src/Samples/bafunctions/bafunctions.cpp b/src/Samples/bafunctions/bafunctions.cpp new file mode 100644 index 00000000..b20f4230 --- /dev/null +++ b/src/Samples/bafunctions/bafunctions.cpp @@ -0,0 +1,46 @@ +// 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. + +#include "precomp.h" + +static HINSTANCE vhInstance = NULL; + +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID /* pvReserved */ + ) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + ::DisableThreadLibraryCalls(hInstance); + vhInstance = hInstance; + break; + + case DLL_PROCESS_DETACH: + vhInstance = NULL; + break; + } + + return TRUE; +} + +extern "C" HRESULT WINAPI BAFunctionsCreate( + __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, + __inout BA_FUNCTIONS_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + + hr = CreateBAFunctions(vhInstance, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create BAFunctions interface."); + +LExit: + return hr; +} + +extern "C" void WINAPI BAFunctionsDestroy( + ) +{ + BalUninitialize(); +} diff --git a/src/Samples/bafunctions/bafunctions.def b/src/Samples/bafunctions/bafunctions.def new file mode 100644 index 00000000..6e016dad --- /dev/null +++ b/src/Samples/bafunctions/bafunctions.def @@ -0,0 +1,6 @@ +; 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. + + +EXPORTS + BAFunctionsCreate + BAFunctionsDestroy diff --git a/src/Samples/bafunctions/bafunctions.rc b/src/Samples/bafunctions/bafunctions.rc new file mode 100644 index 00000000..9643d240 --- /dev/null +++ b/src/Samples/bafunctions/bafunctions.rc @@ -0,0 +1,118 @@ +// 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. + +#include +#include +#include "bafunctionsver.h" + +#define VER_APP +#define VER_ORIGINAL_FILENAME "bafunctions.dll" +#define VER_INTERNAL_NAME "bafunctions" +#define VER_PRODUCT_NAME "WiX Sample BAFunctions" +#define VER_FILE_DESCRIPTION "WiX Sample BAFunctions" + +#ifdef DEBUG + #define VER_DEBUG VS_FF_DEBUG + #define VER_PRIVATE_BUILD VS_FF_PRIVATEBUILD + #define VER_PRE_RELEASE (VS_FF_PRERELEASE | VS_FF_SPECIALBUILD) +#else + #define VER_DEBUG 0 + #define VER_PRIVATE_BUILD 0 + #define VER_PRE_RELEASE 0 +#endif + +#if defined(VER_APP) + #define VER_FILE_TYPE VFT_APP +#elif defined(VER_DLL) + #define VER_FILE_TYPE VFT_DLL +#elif defined(VER_TYPELIB) + #define VER_FILE_TYPE VFT_UNKNOWN +#else + #define VER_FILE_TYPE VFT_UNKNOWN +#endif + +#if defined(VER_LANG_NEUTRAL) + #ifndef VER_LANG + #define VER_LANG 0x0000 + #endif + #ifndef VER_CP + #define VER_CP 0x04E4 + #endif + #ifndef VER_BLOCK + #define VER_BLOCK "000004E4" + #endif +#else + #ifndef VER_LANG + #define VER_LANG 0x0409 + #endif + #ifndef VER_CP + #define VER_CP 0x04E4 + #endif + #ifndef VER_BLOCK + #define VER_BLOCK "040904E4" + #endif +#endif + +#define VER_FILE_VERSION rmj, rmm, rbd, rev +#define VER_PRODUCT_VERSION rmj, rmm, rbd, rev +#define VER_FILE_VERSION_STRING szVerMajorMinorBuildRev +#define VER_PRODUCT_VERSION_STRING VER_FILE_VERSION_STRING +#define VER_FILE_FLAGS_MASK VS_FFI_FILEFLAGSMASK +#define VER_FILE_FLAGS (VER_DEBUG | VER_PRIVATE_BUILD | VER_PRE_RELEASE) + +#define VER_FILE_OS VOS__WINDOWS32 + +#define VER_COMPANY_NAME ".NET Foundation" +#ifndef VER_PRODUCT_NAME + #define VER_PRODUCT_NAME "Windows Installer XML (WiX)" +#endif +#ifndef VER_FILE_DESCRIPTION + #define VER_FILE_DESCRIPTION "Windows Installer XML (WiX) component" +#endif + +#if defined(VER_LEGAL_COPYRIGHT) + #error +#endif +#define VER_LEGAL_COPYRIGHT "Copyright (c) .NET Foundation and contributors.\240 All rights reserved." + +#if !defined(VER_FILE_SUBTYPE) + #define VER_FILE_SUBTYPE 0 +#endif + +#ifdef RC_INVOKED + +VS_VERSION_INFO VERSIONINFO +FILEVERSION VER_FILE_VERSION +PRODUCTVERSION VER_PRODUCT_VERSION +FILEFLAGSMASK VER_FILE_FLAGS_MASK +FILEFLAGS VER_FILE_FLAGS +FILEOS VER_FILE_OS +FILETYPE VER_FILE_TYPE +FILESUBTYPE VER_FILE_SUBTYPE +BEGIN +BLOCK "StringFileInfo" + BEGIN + BLOCK VER_BLOCK + BEGIN + VALUE "CompanyName", VER_COMPANY_NAME + VALUE "FileDescription", VER_FILE_DESCRIPTION + VALUE "FileVersion", VER_FILE_VERSION_STRING + VALUE "InternalName", VER_INTERNAL_NAME + + VALUE "LegalCopyright", VER_LEGAL_COPYRIGHT + + VALUE "OriginalFilename", VER_ORIGINAL_FILENAME + VALUE "ProductName", VER_PRODUCT_NAME + VALUE "ProductVersion", VER_FILE_VERSION_STRING +#if defined(DEBUG) + VALUE "WiX Common Resource Format", "Debug Only" +#endif + END + END + +BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", VER_LANG, VER_CP + END +END + +#endif diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj new file mode 100644 index 00000000..71b27bca --- /dev/null +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -0,0 +1,54 @@ + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + + Debug + ARM + + + Release + ARM + + + + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02} + DynamicLibrary + Unicode + BAFunctions + bafunctions.def + + + + $(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc + comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib + + + + + + + + + + + + + + + + + + diff --git a/src/Samples/bafunctions/bafunctionsver.h b/src/Samples/bafunctions/bafunctionsver.h new file mode 100644 index 00000000..e6e22f4e --- /dev/null +++ b/src/Samples/bafunctions/bafunctionsver.h @@ -0,0 +1,13 @@ +// 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. + +#ifndef _VERSION_FILE_H_ +#define _VERSION_FILE_H_ + +#define szVerMajorMinor "1.0" +#define szVerMajorMinorBuildRev "1.0.0.0" +#define rmj 1 +#define rmm 0 +#define rbd 0 +#define rev 0 + +#endif diff --git a/src/Samples/bafunctions/precomp.h b/src/Samples/bafunctions/precomp.h new file mode 100644 index 00000000..82ce2dae --- /dev/null +++ b/src/Samples/bafunctions/precomp.h @@ -0,0 +1,47 @@ +#pragma once +// 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. + + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// Standard WiX header files, include as required +#include "dutil.h" +//#include "memutil.h" +//#include "dictutil.h" +//#include "dirutil.h" +#include "fileutil.h" +#include "locutil.h" +//#include "logutil.h" +#include "pathutil.h" +//#include "resrutil.h" +//#include "shelutil.h" +#include "strutil.h" +#include "thmutil.h" +//#include "uriutil.h" +//#include "xmlutil.h" +#include "regutil.h" + +//#include "IBootstrapperEngine.h" +//#include "IBootstrapperApplication.h" + +#include "BalBaseBootstrapperApplication.h" +//#include "balinfo.h" +//#include "balcondition.h" +#include "balutil.h" + +#include "BAFunctions.h" +#include "IBAFunctions.h" + +HRESULT WINAPI CreateBAFunctions( + __in HMODULE hModule, + __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, + __inout BA_FUNCTIONS_CREATE_RESULTS* pResults + ); diff --git a/src/Samples/bafunctions/resource.h b/src/Samples/bafunctions/resource.h new file mode 100644 index 00000000..149a8ff4 --- /dev/null +++ b/src/Samples/bafunctions/resource.h @@ -0,0 +1,15 @@ +// 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. + +#define IDC_STATIC -1 + + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/mbahost/host.cpp b/src/mbahost/host.cpp new file mode 100644 index 00000000..694db357 --- /dev/null +++ b/src/mbahost/host.cpp @@ -0,0 +1,656 @@ +// 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. + +#include "precomp.h" +#include // includes the generated assembly name macros. +#include "BalBaseBootstrapperApplicationProc.h" + +static const DWORD NET452_RELEASE = 379893; + +using namespace mscorlib; + +extern "C" typedef HRESULT (WINAPI *PFN_CORBINDTOCURRENTRUNTIME)( + __in LPCWSTR pwszFileName, + __in REFCLSID rclsid, + __in REFIID riid, + __out LPVOID *ppv + ); + +extern "C" typedef HRESULT(WINAPI *PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE)( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); + +static HINSTANCE vhInstance = NULL; +static ICorRuntimeHost *vpCLRHost = NULL; +static _AppDomain *vpAppDomain = NULL; +static HMODULE vhMbapreqModule = NULL; + + +// internal function declarations + +static HRESULT GetAppDomain( + __out _AppDomain** ppAppDomain + ); +static HRESULT GetAppBase( + __out LPWSTR* psczAppBase + ); +static HRESULT CheckSupportedFrameworks( + __in LPCWSTR wzConfigPath + ); +static HRESULT UpdateSupportedRuntime( + __in IXMLDOMDocument* pixdManifest, + __in IXMLDOMNode* pixnSupportedFramework, + __out BOOL* pfUpdatedManifest + ); +static HRESULT GetCLRHost( + __in LPCWSTR wzConfigPath, + __out ICorRuntimeHost** ppCLRHost + ); +static HRESULT CreateManagedBootstrapperApplication( + __in _AppDomain* pAppDomain, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); +static HRESULT CreateManagedBootstrapperApplicationFactory( + __in _AppDomain* pAppDomain, + __out IBootstrapperApplicationFactory** ppAppFactory + ); +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); +static HRESULT VerifyNET4RuntimeIsSupported( + ); + + +// function definitions + +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID /* pvReserved */ + ) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + ::DisableThreadLibraryCalls(hInstance); + vhInstance = hInstance; + break; + + case DLL_PROCESS_DETACH: + vhInstance = NULL; + break; + } + + return TRUE; +} + +// Note: This function assumes that COM was already initialized on the thread. +extern "C" HRESULT WINAPI BootstrapperApplicationCreate( + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + HRESULT hrHostInitialization = S_OK; + IBootstrapperEngine* pEngine = NULL; + + hr = BalInitializeFromCreateArgs(pArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize Bal."); + + hr = GetAppDomain(&vpAppDomain); + if (SUCCEEDED(hr)) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading managed bootstrapper application."); + + hr = CreateManagedBootstrapperApplication(vpAppDomain, pEngine, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the managed bootstrapper application."); + } + else // fallback to the prerequisite BA. + { + if (E_MBAHOST_NET452_ON_WIN7RTM == hr) + { + BalLogError(hr, "The Burn engine cannot run with an MBA under the .NET 4 CLR on Windows 7 RTM with .NET 4.5.2 (or greater) installed."); + hrHostInitialization = hr; + } + else + { + hrHostInitialization = S_OK; + } + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because managed host could not be loaded, error: 0x%08x.", hr); + + hr = CreatePrerequisiteBA(hrHostInitialization, pEngine, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application."); + } + +LExit: + return hr; +} + +extern "C" void WINAPI BootstrapperApplicationDestroy() +{ + if (vpAppDomain) + { + HRESULT hr = vpCLRHost->UnloadDomain(vpAppDomain); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to unload app domain."); + } + + vpAppDomain->Release(); + } + + if (vpCLRHost) + { + vpCLRHost->Stop(); + vpCLRHost->Release(); + } + + if (vhMbapreqModule) + { + PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast(::GetProcAddress(vhMbapreqModule, "MbaPrereqBootstrapperApplicationDestroy")); + if (pfnDestroy) + { + (*pfnDestroy)(); + } + + ::FreeLibrary(vhMbapreqModule); + vhMbapreqModule = NULL; + } + + BalUninitialize(); +} + +// Gets the custom AppDomain for loading managed BA. +static HRESULT GetAppDomain( + __out _AppDomain **ppAppDomain + ) +{ + HRESULT hr = S_OK; + ICorRuntimeHost *pCLRHost = NULL; + IUnknown *pUnk = NULL; + LPWSTR sczAppBase = NULL; + LPWSTR sczConfigPath = NULL; + IAppDomainSetup *pAppDomainSetup; + BSTR bstrAppBase = NULL; + BSTR bstrConfigPath = NULL; + + hr = GetAppBase(&sczAppBase); + ExitOnFailure(hr, "Failed to get the host base path."); + + hr = PathConcat(sczAppBase, L"BootstrapperCore.config", &sczConfigPath); + ExitOnFailure(hr, "Failed to get the full path to the application configuration file."); + + // Check that the supported framework is installed. + hr = CheckSupportedFrameworks(sczConfigPath); + ExitOnFailure(hr, "Failed to find supported framework."); + + // Load the CLR. + hr = GetCLRHost(sczConfigPath, &pCLRHost); + ExitOnFailure(hr, "Failed to create the CLR host."); + + hr = pCLRHost->Start(); + ExitOnRootFailure(hr, "Failed to start the CLR host."); + + // Create the setup information for a new AppDomain to set the app base and config. + hr = pCLRHost->CreateDomainSetup(&pUnk); + ExitOnRootFailure(hr, "Failed to create the AppDomainSetup object."); + + hr = pUnk->QueryInterface(__uuidof(IAppDomainSetup), reinterpret_cast(&pAppDomainSetup)); + ExitOnRootFailure(hr, "Failed to query for the IAppDomainSetup interface."); + ReleaseNullObject(pUnk); + + // Set properties on the AppDomainSetup object. + bstrAppBase = ::SysAllocString(sczAppBase); + ExitOnNull(bstrAppBase, hr, E_OUTOFMEMORY, "Failed to allocate the application base path for the AppDomainSetup."); + + hr = pAppDomainSetup->put_ApplicationBase(bstrAppBase); + ExitOnRootFailure(hr, "Failed to set the application base path for the AppDomainSetup."); + + bstrConfigPath = ::SysAllocString(sczConfigPath); + ExitOnNull(bstrConfigPath, hr, E_OUTOFMEMORY, "Failed to allocate the application configuration file for the AppDomainSetup."); + + hr = pAppDomainSetup->put_ConfigurationFile(bstrConfigPath); + ExitOnRootFailure(hr, "Failed to set the configuration file path for the AppDomainSetup."); + + // Create the AppDomain to load the factory type. + hr = pCLRHost->CreateDomainEx(L"MBA", pAppDomainSetup, NULL, &pUnk); + ExitOnRootFailure(hr, "Failed to create the MBA AppDomain."); + + hr = pUnk->QueryInterface(__uuidof(_AppDomain), reinterpret_cast(ppAppDomain)); + ExitOnRootFailure(hr, "Failed to query for the _AppDomain interface."); + +LExit: + ReleaseBSTR(bstrConfigPath); + ReleaseBSTR(bstrAppBase); + ReleaseStr(sczConfigPath); + ReleaseStr(sczAppBase); + ReleaseNullObject(pUnk); + ReleaseNullObject(pCLRHost); + + return hr; +} + +static HRESULT GetAppBase( + __out LPWSTR *psczAppBase + ) +{ + HRESULT hr = S_OK; + LPWSTR sczFullPath = NULL; + + hr = PathForCurrentProcess(&sczFullPath, vhInstance); + ExitOnFailure(hr, "Failed to get the full host path."); + + hr = PathGetDirectory(sczFullPath, psczAppBase); + ExitOnFailure(hr, "Failed to get the directory of the full process path."); + +LExit: + ReleaseStr(sczFullPath); + + return hr; +} + +// Checks whether at least one of required supported frameworks is installed via the NETFX registry keys. +static HRESULT CheckSupportedFrameworks( + __in LPCWSTR wzConfigPath + ) +{ + HRESULT hr = S_OK; + IXMLDOMDocument* pixdManifest = NULL; + IXMLDOMNodeList* pNodeList = NULL; + IXMLDOMNode* pNode = NULL; + DWORD cSupportedFrameworks = 0; + LPWSTR sczSupportedFrameworkVersion = NULL; + LPWSTR sczFrameworkRegistryKey = NULL; + HKEY hkFramework = NULL; + DWORD dwFrameworkInstalled = 0; + BOOL fUpdatedManifest = FALSE; + + hr = XmlInitialize(); + ExitOnFailure(hr, "Failed to initialize XML."); + + hr = XmlLoadDocumentFromFile(wzConfigPath, &pixdManifest); + ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); + + hr = XmlSelectNodes(pixdManifest, L"/configuration/wix.bootstrapper/host/supportedFramework", &pNodeList); + ExitOnFailure(hr, "Failed to select all supportedFramework elements."); + + hr = pNodeList->get_length(reinterpret_cast(&cSupportedFrameworks)); + ExitOnFailure(hr, "Failed to get the supported framework count."); + + if (cSupportedFrameworks) + { + while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL))) + { + hr = XmlGetAttributeEx(pNode, L"version", &sczSupportedFrameworkVersion); + ExitOnFailure(hr, "Failed to get supportedFramework/@version."); + + hr = StrAllocFormatted(&sczFrameworkRegistryKey, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\%ls", sczSupportedFrameworkVersion); + ExitOnFailure(hr, "Failed to allocate path to supported framework Install registry key."); + + hr = RegOpen(HKEY_LOCAL_MACHINE, sczFrameworkRegistryKey, KEY_READ, &hkFramework); + if (SUCCEEDED(hr)) + { + hr = RegReadNumber(hkFramework, L"Install", &dwFrameworkInstalled); + if (dwFrameworkInstalled) + { + hr = S_OK; + break; + } + } + + ReleaseNullObject(pNode); + } + + // If we looped through all the supported frameworks but didn't find anything, ensure we return a failure. + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + ExitOnRootFailure(hr, "Failed to find a supported framework."); + } + + hr = UpdateSupportedRuntime(pixdManifest, pNode, &fUpdatedManifest); + ExitOnFailure(hr, "Failed to update supportedRuntime."); + } + // else no supported frameworks specified, so the startup/supportedRuntime must be enough. + + if (fUpdatedManifest) + { + hr = XmlSaveDocument(pixdManifest, wzConfigPath); + ExitOnFailure(hr, "Failed to save updated manifest over config file: %ls", wzConfigPath); + } + +LExit: + ReleaseRegKey(hkFramework); + ReleaseStr(sczFrameworkRegistryKey); + ReleaseStr(sczSupportedFrameworkVersion); + ReleaseObject(pNode); + ReleaseObject(pNodeList); + ReleaseObject(pixdManifest); + + XmlUninitialize(); + + return hr; +} + +// Fixes the supportedRuntime element if necessary. +static HRESULT UpdateSupportedRuntime( + __in IXMLDOMDocument* pixdManifest, + __in IXMLDOMNode* pixnSupportedFramework, + __out BOOL* pfUpdatedManifest + ) +{ + HRESULT hr = S_OK; + LPWSTR sczSupportedRuntimeVersion = NULL; + IXMLDOMNode* pixnStartup = NULL; + IXMLDOMNode* pixnSupportedRuntime = NULL; + + *pfUpdatedManifest = FALSE; + + // If the runtime version attribute is not specified, don't update the manifest. + hr = XmlGetAttributeEx(pixnSupportedFramework, L"runtimeVersion", &sczSupportedRuntimeVersion); + if (E_NOTFOUND == hr) + { + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to get supportedFramework/@runtimeVersion."); + + // Get the startup element. Fail if we can't find it since it'll be necessary to load the + // correct runtime. + hr = XmlSelectSingleNode(pixdManifest, L"/configuration/startup", &pixnStartup); + ExitOnFailure(hr, "Failed to get startup element."); + + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + ExitOnRootFailure(hr, "Failed to find startup element in bootstrapper application config."); + } + + // Remove any pre-existing supported runtimes because they'll just get in the way and create our new one. + hr = XmlRemoveChildren(pixnStartup, L"supportedRuntime"); + ExitOnFailure(hr, "Failed to remove pre-existing supportedRuntime elements."); + + hr = XmlCreateChild(pixnStartup, L"supportedRuntime", &pixnSupportedRuntime); + ExitOnFailure(hr, "Failed to create supportedRuntime element."); + + hr = XmlSetAttribute(pixnSupportedRuntime, L"version", sczSupportedRuntimeVersion); + ExitOnFailure(hr, "Failed to set supportedRuntime/@version to '%ls'.", sczSupportedRuntimeVersion); + + *pfUpdatedManifest = TRUE; + +LExit: + ReleaseObject(pixnSupportedRuntime); + ReleaseObject(pixnStartup); + ReleaseStr(sczSupportedRuntimeVersion); + + return hr; +} + +// Gets the CLR host and caches it. +static HRESULT GetCLRHost( + __in LPCWSTR wzConfigPath, + __out ICorRuntimeHost **ppCLRHost + ) +{ + HRESULT hr = S_OK; + UINT uiMode = 0; + HMODULE hModule = NULL; + BOOL fFallbackToCorBindToCurrentRuntime = TRUE; + CLRCreateInstanceFnPtr pfnCLRCreateInstance = NULL; + ICLRMetaHostPolicy* pCLRMetaHostPolicy = NULL; + IStream* pCfgStream = NULL; + LPWSTR pwzVersion = NULL; + DWORD cchVersion = 0; + DWORD dwConfigFlags = 0; + ICLRRuntimeInfo* pCLRRuntimeInfo = NULL; + PFN_CORBINDTOCURRENTRUNTIME pfnCorBindToCurrentRuntime = NULL; + + // Always set the error mode because we will always restore it below. + uiMode = ::SetErrorMode(0); + + // Cache the CLR host to be shutdown later. This can occur on a different thread. + if (!vpCLRHost) + { + // Disable message boxes from being displayed on error and blocking execution. + ::SetErrorMode(uiMode | SEM_FAILCRITICALERRORS); + + hr = LoadSystemLibrary(L"mscoree.dll", &hModule); + ExitOnFailure(hr, "Failed to load mscoree.dll"); + + pfnCLRCreateInstance = reinterpret_cast(::GetProcAddress(hModule, "CLRCreateInstance")); + + if (pfnCLRCreateInstance) + { + hr = pfnCLRCreateInstance(CLSID_CLRMetaHostPolicy, IID_ICLRMetaHostPolicy, reinterpret_cast(&pCLRMetaHostPolicy)); + if (E_NOTIMPL != hr) + { + ExitOnRootFailure(hr, "Failed to create instance of ICLRMetaHostPolicy."); + + fFallbackToCorBindToCurrentRuntime = FALSE; + } + } + + if (fFallbackToCorBindToCurrentRuntime) + { + pfnCorBindToCurrentRuntime = reinterpret_cast(::GetProcAddress(hModule, "CorBindToCurrentRuntime")); + ExitOnNullWithLastError(pfnCorBindToCurrentRuntime, hr, "Failed to get procedure address for CorBindToCurrentRuntime."); + + hr = pfnCorBindToCurrentRuntime(wzConfigPath, CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); + ExitOnRootFailure(hr, "Failed to create the CLR host using the application configuration file path."); + } + else + { + + hr = SHCreateStreamOnFileEx(wzConfigPath, STGM_READ | STGM_SHARE_DENY_WRITE, 0, FALSE, NULL, &pCfgStream); + ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); + + hr = pCLRMetaHostPolicy->GetRequestedRuntime(METAHOST_POLICY_HIGHCOMPAT, NULL, pCfgStream, NULL, &cchVersion, NULL, NULL, &dwConfigFlags, IID_ICLRRuntimeInfo, reinterpret_cast(&pCLRRuntimeInfo)); + ExitOnRootFailure(hr, "Failed to get the CLR runtime info using the application configuration file path."); + + // .NET 4 RTM had a bug where it wouldn't set pcchVersion if pwzVersion was NULL. + if (!cchVersion) + { + hr = pCLRRuntimeInfo->GetVersionString(NULL, &cchVersion); + if (HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) != hr) + { + ExitOnFailure(hr, "Failed to get the length of the CLR version string."); + } + } + + hr = StrAlloc(&pwzVersion, cchVersion); + ExitOnFailure(hr, "Failed to allocate the CLR version string."); + + hr = pCLRRuntimeInfo->GetVersionString(pwzVersion, &cchVersion); + ExitOnFailure(hr, "Failed to get the CLR version string."); + + if (CSTR_EQUAL == CompareString(LOCALE_NEUTRAL, 0, L"v4.0.30319", -1, pwzVersion, cchVersion)) + { + hr = VerifyNET4RuntimeIsSupported(); + ExitOnFailure(hr, "Found unsupported .NET 4 Runtime."); + } + + if (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_TRUE == (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_MASK & dwConfigFlags)) + { + hr = pCLRRuntimeInfo->BindAsLegacyV2Runtime(); + ExitOnRootFailure(hr, "Failed to bind as legacy V2 runtime."); + } + + hr = pCLRRuntimeInfo->GetInterface(CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); + ExitOnRootFailure(hr, "Failed to get instance of ICorRuntimeHost."); + + // TODO: use ICLRRuntimeHost instead of ICorRuntimeHost on .NET 4 since the former is faster and the latter is deprecated + //hr = pCLRRuntimeInfo->GetInterface(CLSID_CLRRuntimeHost, IID_ICLRRuntimeHost, reinterpret_cast(&pCLRRuntimeHost)); + //ExitOnRootFailure(hr, "Failed to get instance of ICLRRuntimeHost."); + } + } + + vpCLRHost->AddRef(); + *ppCLRHost = vpCLRHost; + +LExit: + ReleaseStr(pwzVersion); + ReleaseNullObject(pCLRRuntimeInfo); + ReleaseNullObject(pCfgStream); + ReleaseNullObject(pCLRMetaHostPolicy); + + // Unload the module so it's not in use when we install .NET. + if (FAILED(hr)) + { + ::FreeLibrary(hModule); + } + + ::SetErrorMode(uiMode); // restore the previous error mode. + + return hr; +} + +// Creates the bootstrapper app and returns it for the engine. +static HRESULT CreateManagedBootstrapperApplication( + __in _AppDomain* pAppDomain, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + IBootstrapperApplicationFactory* pAppFactory = NULL; + IBootstrapperApplication* pApp = NULL; + + hr = CreateManagedBootstrapperApplicationFactory(pAppDomain, &pAppFactory); + ExitOnFailure(hr, "Failed to create the factory to create the bootstrapper application."); + + hr = pAppFactory->Create(pEngine, pArgs->pCommand, &pApp); + ExitOnFailure(hr, "Failed to create the bootstrapper application."); + + pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; + pResults->pvBootstrapperApplicationProcContext = pApp; + pApp = NULL; + +LExit: + ReleaseNullObject(pApp); + ReleaseNullObject(pAppFactory); + + return hr; +} + +// Creates the app factory to create the managed app in the default AppDomain. +static HRESULT CreateManagedBootstrapperApplicationFactory( + __in _AppDomain* pAppDomain, + __out IBootstrapperApplicationFactory** ppAppFactory + ) +{ + HRESULT hr = S_OK; + BSTR bstrAssemblyName = NULL; + BSTR bstrTypeName = NULL; + _ObjectHandle* pObj = NULL; + VARIANT vtBAFactory; + + ::VariantInit(&vtBAFactory); + + bstrAssemblyName = ::SysAllocString(MUX_ASSEMBLY_FULL_NAME); + ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory."); + + bstrTypeName = ::SysAllocString(L"WixToolset.Bootstrapper.BootstrapperApplicationFactory"); + ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory."); + + hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj); + ExitOnRootFailure(hr, "Failed to create the BA factory object."); + + hr = pObj->Unwrap(&vtBAFactory); + ExitOnRootFailure(hr, "Failed to unwrap the BA factory object into the host domain."); + ExitOnNull(vtBAFactory.punkVal, hr, E_UNEXPECTED, "The variant did not contain the expected IUnknown pointer."); + + hr = vtBAFactory.punkVal->QueryInterface(__uuidof(IBootstrapperApplicationFactory), reinterpret_cast(ppAppFactory)); + ExitOnRootFailure(hr, "Failed to query for the bootstrapper app factory interface."); + +LExit: + ReleaseVariant(vtBAFactory); + ReleaseNullObject(pObj); + ReleaseBSTR(bstrTypeName); + ReleaseBSTR(bstrAssemblyName); + + return hr; +} + +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + LPWSTR sczMbapreqPath = NULL; + HMODULE hModule = NULL; + + hr = PathRelativeToModule(&sczMbapreqPath, L"mbapreq.dll", vhInstance); + ExitOnFailure(hr, "Failed to get path to pre-requisite BA."); + + hModule = ::LoadLibraryW(sczMbapreqPath); + ExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL."); + + PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast(::GetProcAddress(hModule, "MbaPrereqBootstrapperApplicationCreate")); + ExitOnNullWithLastError(pfnCreate, hr, "Failed to get MbaPrereqBootstrapperApplicationCreate entry-point from: %ls", sczMbapreqPath); + + hr = pfnCreate(hrHostInitialization, pEngine, pArgs, pResults); + ExitOnFailure(hr, "Failed to create prequisite bootstrapper app."); + + vhMbapreqModule = hModule; + hModule = NULL; + +LExit: + if (hModule) + { + ::FreeLibrary(hModule); + } + ReleaseStr(sczMbapreqPath); + + return hr; +} + +static HRESULT VerifyNET4RuntimeIsSupported( + ) +{ + HRESULT hr = S_OK; + OS_VERSION osv = OS_VERSION_UNKNOWN; + DWORD dwServicePack = 0; + HKEY hKey = NULL; + DWORD er = ERROR_SUCCESS; + DWORD dwRelease = 0; + DWORD cchRelease = sizeof(dwRelease); + + OsGetVersion(&osv, &dwServicePack); + if (OS_VERSION_WIN7 == osv && 0 == dwServicePack) + { + hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", KEY_QUERY_VALUE, &hKey); + if (E_FILENOTFOUND == hr) + { + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to open registry key for .NET 4."); + + er = ::RegQueryValueExW(hKey, L"Release", NULL, NULL, reinterpret_cast(&dwRelease), &cchRelease); + if (ERROR_FILE_NOT_FOUND == er) + { + ExitFunction1(hr = S_OK); + } + ExitOnWin32Error(er, hr, "Failed to get Release value."); + + if (NET452_RELEASE <= dwRelease) + { + hr = E_MBAHOST_NET452_ON_WIN7RTM; + } + } + +LExit: + ReleaseRegKey(hKey); + + return hr; +} diff --git a/src/mbahost/host.def b/src/mbahost/host.def new file mode 100644 index 00000000..4488df94 --- /dev/null +++ b/src/mbahost/host.def @@ -0,0 +1,6 @@ +; 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. + + +EXPORTS + BootstrapperApplicationCreate + BootstrapperApplicationDestroy diff --git a/src/mbahost/host.vcxproj b/src/mbahost/host.vcxproj new file mode 100644 index 00000000..a4c3ea16 --- /dev/null +++ b/src/mbahost/host.vcxproj @@ -0,0 +1,51 @@ + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + + {12C87C77-3547-44F8-8134-29BC915CB19D} + DynamicLibrary + Unicode + mbahost + host.def + + + + + + $(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc;$(BaseIntermediateOutputPath)\core + dutil.lib;balutil.lib;shlwapi.lib + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/mbahost/precomp.h b/src/mbahost/precomp.h new file mode 100644 index 00000000..d29a23f3 --- /dev/null +++ b/src/mbahost/precomp.h @@ -0,0 +1,25 @@ +#pragma once +// 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. + + +#include +#include +#include +#include + +#import raw_interfaces_only rename("ReportEvent", "mscorlib_ReportEvent") + +#include +#include +#include +#include +#include +#include + +#include "BootstrapperEngine.h" +#include "BootstrapperApplication.h" +#include "IBootstrapperEngine.h" +#include "IBootstrapperApplication.h" +#include "IBootstrapperApplicationFactory.h" + +#include "balutil.h" diff --git a/src/wixext/BalBinder.cs b/src/wixext/BalBinder.cs new file mode 100644 index 00000000..30f7ab44 --- /dev/null +++ b/src/wixext/BalBinder.cs @@ -0,0 +1,125 @@ +// 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. + +namespace WixToolset.Extensions +{ + using System; + using System.Collections.Generic; + using System.Linq; + using System.Text; + using WixToolset; + using WixToolset.Data; + using WixToolset.Data.Rows; + using WixToolset.Extensibility; + + public class BalBinder : BinderExtension + { + public override void Finish(Output output) + { + // Only process Bundles. + if (OutputType.Bundle != output.Type) + { + return; + } + + Table baTable = output.Tables["WixBootstrapperApplication"]; + Row baRow = baTable.Rows[0]; + string baId = (string)baRow[0]; + if (null == baId) + { + return; + } + + bool isStdBA = baId.StartsWith("WixStandardBootstrapperApplication"); + bool isMBA = baId.StartsWith("ManagedBootstrapperApplicationHost"); + + if (isStdBA || isMBA) + { + VerifyBAFunctions(output); + } + + if (isMBA) + { + VerifyPrereqPackages(output); + } + } + + private void VerifyBAFunctions(Output output) + { + Row baFunctionsRow = null; + Table baFunctionsTable = output.Tables["WixBalBAFunctions"]; + foreach (Row row in baFunctionsTable.RowsAs()) + { + if (null == baFunctionsRow) + { + baFunctionsRow = row; + } + else + { + this.Core.OnMessage(BalErrors.MultipleBAFunctions(row.SourceLineNumbers)); + } + } + + Table payloadPropertiesTable = output.Tables["WixPayloadProperties"]; + IEnumerable payloadPropertiesRows = payloadPropertiesTable.RowsAs(); + if (null == baFunctionsRow) + { + foreach (WixPayloadPropertiesRow payloadPropertiesRow in payloadPropertiesRows) + { + // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). + if (String.Equals(payloadPropertiesRow.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) + { + this.Core.OnMessage(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesRow.SourceLineNumbers)); + } + } + } + else + { + // TODO: May need to revisit this depending on the outcome of #5273. + string payloadId = (string)baFunctionsRow[0]; + WixPayloadPropertiesRow bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id); + if (Compiler.BurnUXContainerId != bundlePayloadRow.Container) + { + this.Core.OnMessage(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers)); + } + } + } + + private void VerifyPrereqPackages(Output output) + { + Table prereqInfoTable = output.Tables["WixMbaPrereqInformation"]; + if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0) + { + this.Core.OnMessage(BalErrors.MissingPrereq()); + return; + } + + bool foundLicenseFile = false; + bool foundLicenseUrl = false; + + foreach (Row prereqInfoRow in prereqInfoTable.Rows) + { + if (null != prereqInfoRow[1]) + { + if (foundLicenseFile || foundLicenseUrl) + { + this.Core.OnMessage(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); + return; + } + + foundLicenseFile = true; + } + + if (null != prereqInfoRow[2]) + { + if (foundLicenseFile || foundLicenseUrl) + { + this.Core.OnMessage(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); + return; + } + + foundLicenseUrl = true; + } + } + } + } +} diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs new file mode 100644 index 00000000..38ca9e3c --- /dev/null +++ b/src/wixext/BalCompiler.cs @@ -0,0 +1,562 @@ +// 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. + +namespace WixToolset.Extensions +{ + using System; + using System.Collections.Generic; + using System.Xml.Linq; + using WixToolset.Data; + using WixToolset.Data.Rows; + using WixToolset.Extensibility; + + /// + /// The compiler for the WiX Toolset Bal Extension. + /// + public sealed class BalCompiler : CompilerExtension + { + private SourceLineNumber addedConditionLineNumber; + private Dictionary prereqInfoRows; + + /// + /// Instantiate a new BalCompiler. + /// + public BalCompiler() + { + this.addedConditionLineNumber = null; + prereqInfoRows = new Dictionary(); + this.Namespace = "http://wixtoolset.org/schemas/v4/wxs/bal"; + } + + /// + /// Processes an element for the Compiler. + /// + /// Parent element of element to process. + /// Element to process. + /// Extra information about the context in which this element is being parsed. + public override void ParseElement(XElement parentElement, XElement element, IDictionary context) + { + switch (parentElement.Name.LocalName) + { + case "Bundle": + case "Fragment": + switch (element.Name.LocalName) + { + case "Condition": + this.ParseConditionElement(element); + break; + default: + this.Core.UnexpectedElement(parentElement, element); + break; + } + break; + case "BootstrapperApplicationRef": + switch (element.Name.LocalName) + { + case "WixStandardBootstrapperApplication": + this.ParseWixStandardBootstrapperApplicationElement(element); + break; + case "WixManagedBootstrapperApplicationHost": + this.ParseWixManagedBootstrapperApplicationHostElement(element); + break; + default: + this.Core.UnexpectedElement(parentElement, element); + break; + } + break; + default: + this.Core.UnexpectedElement(parentElement, element); + break; + } + } + + /// + /// Processes an attribute for the Compiler. + /// + /// Source line number for the parent element. + /// Parent element of element to process. + /// Attribute to process. + /// Extra information about the context in which this element is being parsed. + public override void ParseAttribute(XElement parentElement, XAttribute attribute, IDictionary context) + { + SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(parentElement); + Row row; + + switch (parentElement.Name.LocalName) + { + case "ExePackage": + case "MsiPackage": + case "MspPackage": + case "MsuPackage": + string packageId; + if (!context.TryGetValue("PackageId", out packageId) || String.IsNullOrEmpty(packageId)) + { + this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); + } + else + { + switch (attribute.Name.LocalName) + { + case "PrereqLicenseFile": + + if (!prereqInfoRows.TryGetValue(packageId, out row)) + { + // at the time the extension attribute is parsed, the compiler might not yet have + // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. + XAttribute prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); + + if (null != prereqPackage && YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) + { + row = this.Core.CreateRow(sourceLineNumbers, "WixMbaPrereqInformation"); + row[0] = packageId; + + prereqInfoRows.Add(packageId, row); + } + else + { + this.Core.OnMessage(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile")); + break; + } + } + + if (null != row[2]) + { + this.Core.OnMessage(WixErrors.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile", "PrereqLicenseUrl")); + } + else + { + row[1] = this.Core.GetAttributeValue(sourceLineNumbers, attribute); + } + break; + case "PrereqLicenseUrl": + + if (!prereqInfoRows.TryGetValue(packageId, out row)) + { + // at the time the extension attribute is parsed, the compiler might not yet have + // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. + XAttribute prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); + + if (null != prereqPackage && YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) + { + row = this.Core.CreateRow(sourceLineNumbers, "WixMbaPrereqInformation"); + row[0] = packageId; + + prereqInfoRows.Add(packageId, row); + } + else + { + this.Core.OnMessage(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl")); + break; + } + } + + if (null != row[1]) + { + this.Core.OnMessage(WixErrors.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl", "PrereqLicenseFile")); + } + else + { + row[2] = this.Core.GetAttributeValue(sourceLineNumbers, attribute); + } + break; + case "PrereqPackage": + if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + { + if (!prereqInfoRows.TryGetValue(packageId, out row)) + { + row = this.Core.CreateRow(sourceLineNumbers, "WixMbaPrereqInformation"); + row[0] = packageId; + + prereqInfoRows.Add(packageId, row); + } + } + break; + default: + this.Core.UnexpectedAttribute(parentElement, attribute); + break; + } + } + break; + case "Payload": + string payloadId; + if (!context.TryGetValue("Id", out payloadId) || String.IsNullOrEmpty(payloadId)) + { + this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); + } + else + { + switch (attribute.Name.LocalName) + { + case "BAFunctions": + if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + { + row = this.Core.CreateRow(sourceLineNumbers, "WixBalBAFunctions"); + row[0] = payloadId; + } + break; + default: + this.Core.UnexpectedAttribute(parentElement, attribute); + break; + } + } + break; + case "Variable": + // at the time the extension attribute is parsed, the compiler might not yet have + // parsed the Name attribute, so we need to get it directly from the parent element. + XAttribute variableName = parentElement.Attribute("Name"); + if (null == variableName) + { + this.Core.OnMessage(WixErrors.ExpectedParentWithAttribute(sourceLineNumbers, "Variable", "Overridable", "Name")); + } + else + { + switch (attribute.Name.LocalName) + { + case "Overridable": + if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + { + row = this.Core.CreateRow(sourceLineNumbers, "WixStdbaOverridableVariable"); + row[0] = variableName; + } + break; + default: + this.Core.UnexpectedAttribute(parentElement, attribute); + break; + } + } + break; + } + } + + /// + /// Parses a Condition element for Bundles. + /// + /// The element to parse. + private void ParseConditionElement(XElement node) + { + SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); + string condition = this.Core.GetConditionInnerText(node); // condition is the inner text of the element. + string message = null; + + foreach (XAttribute attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Message": + message = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.Core.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.Core.ParseExtensionAttribute(node, attrib); + } + } + + this.Core.ParseForExtensionElements(node); + + // Error check the values. + if (String.IsNullOrEmpty(condition)) + { + this.Core.OnMessage(WixErrors.ConditionExpected(sourceLineNumbers, node.Name.LocalName)); + } + + if (null == message) + { + this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Message")); + } + + if (!this.Core.EncounteredError) + { + Row row = this.Core.CreateRow(sourceLineNumbers, "WixBalCondition"); + row[0] = condition; + row[1] = message; + + if (null == this.addedConditionLineNumber) + { + this.addedConditionLineNumber = sourceLineNumbers; + } + } + } + + /// + /// Parses a WixStandardBootstrapperApplication element for Bundles. + /// + /// The element to parse. + private void ParseWixStandardBootstrapperApplicationElement(XElement node) + { + SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); + string launchTarget = null; + string launchTargetElevatedId = null; + string launchArguments = null; + YesNoType launchHidden = YesNoType.NotSet; + string launchWorkingDir = null; + string licenseFile = null; + string licenseUrl = null; + string logoFile = null; + string logoSideFile = null; + string themeFile = null; + string localizationFile = null; + YesNoType suppressOptionsUI = YesNoType.NotSet; + YesNoType suppressDowngradeFailure = YesNoType.NotSet; + YesNoType suppressRepair = YesNoType.NotSet; + YesNoType showVersion = YesNoType.NotSet; + YesNoType supportCacheOnly = YesNoType.NotSet; + + foreach (XAttribute attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "LaunchTarget": + launchTarget = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LaunchTargetElevatedId": + launchTargetElevatedId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "LaunchArguments": + launchArguments = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LaunchHidden": + launchHidden = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "LaunchWorkingFolder": + launchWorkingDir = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LicenseFile": + licenseFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LicenseUrl": + licenseUrl = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); + break; + case "LogoFile": + logoFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LogoSideFile": + logoSideFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ThemeFile": + themeFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LocalizationFile": + localizationFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "SuppressOptionsUI": + suppressOptionsUI = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "SuppressDowngradeFailure": + suppressDowngradeFailure = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "SuppressRepair": + suppressRepair = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "ShowVersion": + showVersion = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "SupportCacheOnly": + supportCacheOnly = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + default: + this.Core.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.Core.ParseExtensionAttribute(node, attrib); + } + } + + this.Core.ParseForExtensionElements(node); + + if (String.IsNullOrEmpty(licenseFile) && null == licenseUrl) + { + this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true)); + } + + if (!this.Core.EncounteredError) + { + if (!String.IsNullOrEmpty(launchTarget)) + { + WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixBundleVariable"); + row.Id = "LaunchTarget"; + row.Value = launchTarget; + row.Type = "string"; + } + + if (!String.IsNullOrEmpty(launchTargetElevatedId)) + { + WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixBundleVariable"); + row.Id = "LaunchTargetElevatedId"; + row.Value = launchTargetElevatedId; + row.Type = "string"; + } + + if (!String.IsNullOrEmpty(launchArguments)) + { + WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixBundleVariable"); + row.Id = "LaunchArguments"; + row.Value = launchArguments; + row.Type = "string"; + } + + if (YesNoType.Yes == launchHidden) + { + WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixBundleVariable"); + row.Id = "LaunchHidden"; + row.Value = "yes"; + row.Type = "string"; + } + + + if (!String.IsNullOrEmpty(launchWorkingDir)) + { + WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "Variable"); + row.Id = "LaunchWorkingFolder"; + row.Value = launchWorkingDir; + row.Type = "string"; + } + + if (!String.IsNullOrEmpty(licenseFile)) + { + WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = "WixStdbaLicenseRtf"; + wixVariableRow.Value = licenseFile; + } + + if (null != licenseUrl) + { + WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = "WixStdbaLicenseUrl"; + wixVariableRow.Value = licenseUrl; + } + + if (!String.IsNullOrEmpty(logoFile)) + { + WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = "WixStdbaLogo"; + wixVariableRow.Value = logoFile; + } + + if (!String.IsNullOrEmpty(logoSideFile)) + { + WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = "WixStdbaLogoSide"; + wixVariableRow.Value = logoSideFile; + } + + if (!String.IsNullOrEmpty(themeFile)) + { + WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = "WixStdbaThemeXml"; + wixVariableRow.Value = themeFile; + } + + if (!String.IsNullOrEmpty(localizationFile)) + { + WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = "WixStdbaThemeWxl"; + wixVariableRow.Value = localizationFile; + } + + if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly) + { + Row row = this.Core.CreateRow(sourceLineNumbers, "WixStdbaOptions"); + if (YesNoType.Yes == suppressOptionsUI) + { + row[0] = 1; + } + + if (YesNoType.Yes == suppressDowngradeFailure) + { + row[1] = 1; + } + + if (YesNoType.Yes == suppressRepair) + { + row[2] = 1; + } + + if (YesNoType.Yes == showVersion) + { + row[3] = 1; + } + + if (YesNoType.Yes == supportCacheOnly) + { + row[4] = 1; + } + } + } + } + + /// + /// Parses a WixManagedBootstrapperApplicationHost element for Bundles. + /// + /// The element to parse. + private void ParseWixManagedBootstrapperApplicationHostElement(XElement node) + { + SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); + string logoFile = null; + string themeFile = null; + string localizationFile = null; + + foreach (XAttribute attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "LogoFile": + logoFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ThemeFile": + themeFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LocalizationFile": + localizationFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.Core.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.Core.ParseExtensionAttribute(node, attrib); + } + } + + this.Core.ParseForExtensionElements(node); + + if (!this.Core.EncounteredError) + { + if (!String.IsNullOrEmpty(logoFile)) + { + WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = "PreqbaLogo"; + wixVariableRow.Value = logoFile; + } + + if (!String.IsNullOrEmpty(themeFile)) + { + WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = "PreqbaThemeXml"; + wixVariableRow.Value = themeFile; + } + + if (!String.IsNullOrEmpty(localizationFile)) + { + WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = "PreqbaThemeWxl"; + wixVariableRow.Value = localizationFile; + } + } + } + } +} diff --git a/src/wixext/BalExtensionData.cs b/src/wixext/BalExtensionData.cs new file mode 100644 index 00000000..7e8dea5b --- /dev/null +++ b/src/wixext/BalExtensionData.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Extensions +{ + using System; + using System.Reflection; + using WixToolset.Data; + using WixToolset.Extensibility; + + /// + /// The WiX Toolset Bal Extension. + /// + public sealed class BalExtensionData : ExtensionData + { + /// + /// Gets the optional table definitions for this extension. + /// + /// The optional table definitions for this extension. + public override TableDefinitionCollection TableDefinitions + { + get + { + return BalExtensionData.GetExtensionTableDefinitions(); + } + } + + /// + /// Gets the library associated with this extension. + /// + /// The table definitions to use while loading the library. + /// The loaded library. + public override Library GetLibrary(TableDefinitionCollection tableDefinitions) + { + return BalExtensionData.GetExtensionLibrary(tableDefinitions); + } + + /// + /// Internal mechanism to access the extension's table definitions. + /// + /// Extension's table definitions. + internal static TableDefinitionCollection GetExtensionTableDefinitions() + { + return ExtensionData.LoadTableDefinitionHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.tables.xml"); + } + + /// + /// Internal mechanism to access the extension's library. + /// + /// Extension's library. + internal static Library GetExtensionLibrary(TableDefinitionCollection tableDefinitions) + { + return ExtensionData.LoadLibraryHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.bal.wixlib", tableDefinitions); + } + } +} diff --git a/src/wixext/WixBalExtension.csproj b/src/wixext/WixBalExtension.csproj new file mode 100644 index 00000000..3e9d382e --- /dev/null +++ b/src/wixext/WixBalExtension.csproj @@ -0,0 +1,47 @@ + + + + + + + {BF720A63-9D7B-456E-B60C-8122852D9FED} + WixBalExtension + Library + WixToolset.Extensions + + + + + + + + $(RootNamespace).Data.Messages.resources + + + $(RootNamespace).Data.tables.xml + + + $(RootNamespace).Xsd.bal.xsd + PreserveNewest + + + WixToolset.Data.Serialize + WixToolset.Extensions.Serialize.Bal + + + Data\bal.wixlib + + + + + + + + + + + false + + + + diff --git a/src/wixext/bal.xsd b/src/wixext/bal.xsd new file mode 100644 index 00000000..73f10540 --- /dev/null +++ b/src/wixext/bal.xsd @@ -0,0 +1,266 @@ + + + + + + + + The source code schema for the WiX Toolset Burn User Experience Extension. + + + + + + + + + Conditions for a bundle. The condition is specified in the inner text of the element. + + + + + + + + + + + + The condition that must evaluate to true for the installation to continue. + + + + + + Set the value to the text to display when the condition fails and the installation must be terminated. + + + + + + + + + + + + Configures WixStandardBootstrapperApplication for a Bundle. + + + + + + + + + + If set, the success page will show a Launch button the user can use to launch the application being installed. + The string value can be formatted using Burn variables enclosed in brackets, + to refer to installation directories and so forth. + + + + + + + Id of the target ApprovedExeForElevation element. + If set with LaunchTarget, WixStdBA will launch the application through the Engine's LaunchApprovedExe method instead of through ShellExecute. + + + + + + + If set, WixStdBA will supply these arguments when launching the application specified by the LaunchTarget attribute. + The string value can be formatted using Burn variables enclosed in brackets, + to refer to installation directories and so forth. + + + + + + + If set to "yes", WixStdBA will launch the application specified by the LaunchTarget attribute with the SW_HIDE flag. + This attribute is ignored when the LaunchTargetElevatedId attribute is specified. + + + + + + + WixStdBA will use this working folder when launching the specified application. + The string value can be formatted using Burn variables enclosed in brackets, + to refer to installation directories and so forth. + This attribute is ignored when the LaunchTargetElevatedId attribute is specified. + + + + + + Source file of the RTF license file. Cannot be used simultaneously with LicenseUrl. + + + + + URL target of the license link. Cannot be used simultaneously with LicenseFile. This attribute can be empty to hide the license link completely. + + + + + Source file of the logo graphic. + + + + + Source file of the side logo graphic. + + + + + Source file of the theme XML. + + + + + Source file of the theme localization .wxl file. + + + + + If set to "yes", the Options button will not be shown and the user will not be able to choose an installation directory. + + + + + If set to "yes", attempting to installer a downgraded version of a bundle will be treated as a successful do-nothing operation. + The default behavior (or when explicitly set to "no") is to treat downgrade attempts as failures. + + + + + If set to "yes", the Repair button will not be shown in the maintenance-mode UI. + + + + + If set to "yes", the application version will be displayed on the UI. + + + + + If set to "yes", the bundle can be pre-cached using the /cache command line argument. + + + + + + + + + Configures the ManagedBootstrapperApplicationHost for a Bundle. + + + + + + + + + Source file of the logo graphic. + + + + + Source file of the theme XML. + + + + + Source file of the theme localization .wxl file. + + + + + + + + + When set to "yes", WixStdBA will load the DLL and work with it to handle BA messages. + + + + + + + + + + + When set to "yes", lets the user override the variable's default value by specifying another value on the command line, + in the form Variable=Value. Otherwise, WixStdBA won't overwrite the default value and will log + "Ignoring attempt to set non-overridable variable: 'BAR'." + + + + + + + + + + + Source file of the RTF license file. + There may only be one package in the bundle that has either the PrereqLicenseFile attribute or the PrereqLicenseUrl attribute. + + + + + + + + + + + + + + URL target of the license link. + There may only be one package in the bundle that has either the PrereqLicenseFile attribute or the PrereqLicenseUrl attribute. + + + + + + + + + + + + + + When set to "yes", the Prereq BA will plan the package to be installed if its InstallCondition is "true" or empty. + + + + + + + + + + + + + Values of this type will either be "yes" or "no". + + + + + + + diff --git a/src/wixext/messages.xml b/src/wixext/messages.xml new file mode 100644 index 00000000..9b11981d --- /dev/null +++ b/src/wixext/messages.xml @@ -0,0 +1,43 @@ + + + + + + + + + When the {0}/@{1} attribute is specified, the {0}/@PrereqPackage attribute must be set to "yes". + + + + + + + There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost. + This is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups. + + + + + There may only be one package in the bundle that has either the PrereqLicenseFile attribute or the PrereqLicenseUrl attribute. + + + + + WixStandardBootstrapperApplication doesn't support multiple BAFunctions DLLs. + + + + + The BAFunctions DLL Payload element must be located inside the BootstrapperApplication container. + + + + + + + WixStandardBootstrapperApplication doesn't automatically load BAFunctions.dll. Use the bal:BAFunctions attribute to indicate that it should be loaded. + + + + diff --git a/src/wixext/tables.xml b/src/wixext/tables.xml new file mode 100644 index 00000000..18abf1d7 --- /dev/null +++ b/src/wixext/tables.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/BalExtension.wixproj b/src/wixlib/BalExtension.wixproj new file mode 100644 index 00000000..e2898e83 --- /dev/null +++ b/src/wixlib/BalExtension.wixproj @@ -0,0 +1,39 @@ + + + + + + + {3444D952-F21C-496F-AB6B-56435BFD0787} + bal + Library + true + true + en-us + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/BalExtension.wxs b/src/wixlib/BalExtension.wxs new file mode 100644 index 00000000..2da3d5b2 --- /dev/null +++ b/src/wixlib/BalExtension.wxs @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs new file mode 100644 index 00000000..6f18bf51 --- /dev/null +++ b/src/wixlib/Mba.wxs @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/NetFx451AsPrereq.wxs b/src/wixlib/NetFx451AsPrereq.wxs new file mode 100644 index 00000000..67c05b05 --- /dev/null +++ b/src/wixlib/NetFx451AsPrereq.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + $(var.NetFx451WebId) + $(var.NetFx451EulaLink) + + + + + + + + + + + + + $(var.NetFx451RedistId) + $(var.NetFx451EulaLink) + + + + diff --git a/src/wixlib/NetFx452AsPrereq.wxs b/src/wixlib/NetFx452AsPrereq.wxs new file mode 100644 index 00000000..b41a9986 --- /dev/null +++ b/src/wixlib/NetFx452AsPrereq.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + $(var.NetFx452WebId) + $(var.NetFx452EulaLink) + + + + + + + + + + + + + $(var.NetFx452RedistId) + $(var.NetFx452EulaLink) + + + + diff --git a/src/wixlib/NetFx45AsPrereq.wxs b/src/wixlib/NetFx45AsPrereq.wxs new file mode 100644 index 00000000..b95fc8a4 --- /dev/null +++ b/src/wixlib/NetFx45AsPrereq.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + $(var.NetFx45WebId) + $(var.NetFx45EulaLink) + + + + + + + + + + + + + $(var.NetFx45RedistId) + $(var.NetFx45EulaLink) + + + + diff --git a/src/wixlib/NetFx461AsPrereq.wxs b/src/wixlib/NetFx461AsPrereq.wxs new file mode 100644 index 00000000..d6b24b43 --- /dev/null +++ b/src/wixlib/NetFx461AsPrereq.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + $(var.NetFx461WebId) + $(var.NetFx461EulaLink) + + + + + + + + + + + + + $(var.NetFx461RedistId) + $(var.NetFx461EulaLink) + + + + diff --git a/src/wixlib/NetFx462AsPrereq.wxs b/src/wixlib/NetFx462AsPrereq.wxs new file mode 100644 index 00000000..e6f6889a --- /dev/null +++ b/src/wixlib/NetFx462AsPrereq.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + $(var.NetFx462WebId) + $(var.NetFx462EulaLink) + + + + + + + + + + + + + $(var.NetFx462RedistId) + $(var.NetFx462EulaLink) + + + + diff --git a/src/wixlib/NetFx46AsPrereq.wxs b/src/wixlib/NetFx46AsPrereq.wxs new file mode 100644 index 00000000..52880022 --- /dev/null +++ b/src/wixlib/NetFx46AsPrereq.wxs @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + $(var.NetFx46WebId) + $(var.NetFx46EulaLink) + + + + + + + + + + + + + $(var.NetFx46RedistId) + $(var.NetFx46EulaLink) + + + + diff --git a/src/wixlib/NetFx4AsPrereq.wxs b/src/wixlib/NetFx4AsPrereq.wxs new file mode 100644 index 00000000..83fc8e35 --- /dev/null +++ b/src/wixlib/NetFx4AsPrereq.wxs @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + $(var.NetFx40WebId) + $(var.NetFx40EulaLink) + + + + + + + + + + + + + $(var.NetFx40RedistId) + $(var.NetFx40EulaLink) + + + + + + + + + + + + + $(var.NetFx40ClientWebId) + $(var.NetFx40EulaLink) + + + + + + + + + + + + + $(var.NetFx40ClientRedistId) + $(var.NetFx40EulaLink) + + + + + + + + + + + + + diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs new file mode 100644 index 00000000..b0476fe2 --- /dev/null +++ b/src/wixlib/wixstdba.wxs @@ -0,0 +1,93 @@ + + + + + + + + + + + + + + + + + + !(wix.WixStdbaLicenseRtfName=license.rtf) + + + + + + + + + + + + + + + + + !(wix.WixStdbaLicenseRtfName=license.rtf) + + + + + + + + + + + + + + + !(wix.WixStdbaLicenseUrl) + + + + + + + + + + + + + + + !(wix.WixStdbaLicenseUrl) + + + + + + + + + + + + + + + + !(wix.WixStdbaLicenseUrl) + + + + + + + + + + + + diff --git a/src/wixlib/wixstdba_platform.wxi b/src/wixlib/wixstdba_platform.wxi new file mode 100644 index 00000000..4076e30c --- /dev/null +++ b/src/wixlib/wixstdba_platform.wxi @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/wixstdba_x86.wxs b/src/wixlib/wixstdba_x86.wxs new file mode 100644 index 00000000..09a5080c --- /dev/null +++ b/src/wixlib/wixstdba_x86.wxs @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/wixstdba/Resources/1028/mbapreq.wxl b/src/wixstdba/Resources/1028/mbapreq.wxl new file mode 100644 index 00000000..abd35ac7 --- /dev/null +++ b/src/wixstdba/Resources/1028/mbapreq.wxl @@ -0,0 +1,27 @@ + + + + + + [WixBundleName] 安裝程式 + [WixBundleName] 安裝程式需要 Microsoft .NET Framework + 您確定要取消嗎? + 安裝程式說明 + /passive | /quiet - 顯示最基本的 UI 但不顯示提示，或者不顯示 UI 也 + 不顯示提示。預設會顯示 UI 和所有提示。 + +/norestart - 隱藏任何重新啟動嘗試。根據預設，UI 會在重新啟動之前提示。 +/log log.txt - 記錄至特定檔案。預設會在 %TEMP% 建立記錄檔。 + 關閉(&C) + 請按一下 「接受並安裝」5D; 按鈕，接受 Microsoft .NET Framework <a href="#">授權合約</a>。 + 接受並安裝(&A) + 拒絕(&D) + 安裝進度 + 正在處理: + 取消(&) + 安裝失敗 + 一或多個問題導致安裝失敗。請修正這些問題，然後再重試安裝。如需詳細資訊，請查看<a href="#">記錄檔</a>。 + 必須重新啟動電腦，才能完成軟體的復原。 + 重新啟動(&R) + 關閉(&C) + diff --git a/src/wixstdba/Resources/1029/mbapreq.wxl b/src/wixstdba/Resources/1029/mbapreq.wxl new file mode 100644 index 00000000..e28b4f74 --- /dev/null +++ b/src/wixstdba/Resources/1029/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + Instalace produktu [WixBundleName] + Pro instalaci produktu [WixBundleName] je vyžadováno rozhraní Microsoft .NET Framework. + Opravdu chcete akci zrušit? + Nápověda k instalaci + /passive | /quiet - Zobrazí minimální uživatelské rozhraní bez jakýchkoli + výzev, nebo nezobrazí žádné uživatelské rozhraní ani žádné výzvy. Ve výchozím + nastavení se jak uživatelské rozhraní, tak i všechny výzvy zobrazují. + +/norestart - Potlačí jakékoli pokusy o restartování. Ve výchozím nastavení + se v uživatelském rozhraní před restartováním zobrazí výzva. +/log log.txt - Nastaví, že se má zapisovat do konkrétního souboru protokolu. + Ve výchozím nastavení je soubor protokolu vytvořen v umístění %TEMP%. + &Zavřít + Kliknutím na tlačítko Přijmout a nainstalovat přijmete <a href="#">licenční podmínky</a> rozhraní Microsoft .NET Framework. + &Přijmout a instalovat + &Odmítnout + Průběh instalace + Probíhá zpracování: + &Storno + Instalace se nezdařila + Byly zjištěny problémy, kvůli kterým se instalaci nepodařilo dokončit. Odstraňte tyto problémy a potom instalaci opakujte. Další informace naleznete v <a href="#">souboru protokolu</a>. + Aby bylo možné zrušení instalace softwaru dokončit, je nutné počítač restartovat. + &Restartovat + &Zavřít + diff --git a/src/wixstdba/Resources/1030/mbapreq.wxl b/src/wixstdba/Resources/1030/mbapreq.wxl new file mode 100644 index 00000000..a531467a --- /dev/null +++ b/src/wixstdba/Resources/1030/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + Installation af [WixBundleName] + Microsoft .NET Framework skal være installeret i forbindelse med Installationen af [WixBundleName] + Er du sikker på, at du vil annullere? + Hjælp til installation + /passive | /quiet - viser en minimal brugergrænseflade uden prompter eller + viser ingen brugergrænseflade og ingen prompter. + Brugergrænsefladen og alle prompter vises som standard. + +/norestart - skjuler forsøg på genstart. Der vises som standard en + forespørgsel i brugergrænsefladen, før der genstartes. +/log log.txt - logfører til en bestemt fil. Der oprettes som standard en + logfil i %TEMP%. + &Luk + Klik på knappen "Acceptér og installér" for at acceptere <a href="#">licensvilkårene</a> for Microsoft .NET Framework. + &Acceptér og installér + &Afvis + Status for installation + Behandler: + &Annuller + Installationen blev ikke gennemført + Installationen blev ikke gennemført på grund af et eller flere problemer. Løs problemerne, og prøv derefter at installere igen. Se <a href="#">logfilen</a> for at få flere oplysninger. + Du skal genstarte computeren for at fuldføre annulleringen af opdateringen af softwaren. + &Genstart + &Luk + diff --git a/src/wixstdba/Resources/1031/mbapreq.wxl b/src/wixstdba/Resources/1031/mbapreq.wxl new file mode 100644 index 00000000..ff8111f9 --- /dev/null +++ b/src/wixstdba/Resources/1031/mbapreq.wxl @@ -0,0 +1,33 @@ + + + + + + + + [WixBundleName]-Setup + Für das [WixBundleName]-Setup ist Microsoft .NET Framework erforderlich. + Sind Sie sicher, dass Sie den Vorgang abbrechen möchten? + Setup-Hilfe + /passive | /quiet - zeigt eine minimale Benutzeroberfläche ohne + Eingabeaufforderungen oder keine Benutzeroberfläche und keine + Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und + alle Eingabeaufforderungen angezeigt. + +/norestart - unterdrückt alle Neustartversuche. Standardmäßig fordert die + Benutzeroberfläche zum Bestätigen eines Neustarts auf. +/log log.txt - erstellt das Protokoll in einer bestimmten Datei. + Standardmäßig wird die Protokolldatei in "%TEMP%" erstellt. + &Schließen + Klicken Sie auf die Schaltfläche "Akzeptieren und installieren", um den Microsoft .NET Framework <a href="#">-Lizenzbedingungen</a> zuzustimmen. + &Akzeptieren und installieren + &Ablehnen + Setup-Status + Verarbeitung: + &Abbrechen + Setup-Fehler + Beim Setup ist aufgrund mindestens eines Problems ein Fehler aufgetreten. Beheben Sie die Probleme, und wiederholen Sie das Setup. Weitere Informationen finden Sie in der <a href="#">Protokolldatei</a>. + Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen. + &Neu starten + &Schließen + diff --git a/src/wixstdba/Resources/1032/mbapreq.wxl b/src/wixstdba/Resources/1032/mbapreq.wxl new file mode 100644 index 00000000..bc3703a3 --- /dev/null +++ b/src/wixstdba/Resources/1032/mbapreq.wxl @@ -0,0 +1,32 @@ + + + + + + Εγκατάσταση του [WixBundleName] + Για την εγκατάσταση του [WixBundleName] απαιτείται το Microsoft .NET Framework + Είστε βέβαιοι ότι θέλετε να γίνει ακύρωση; + Βοήθεια για την εγκατάσταση + /passive | /quiet - εμφανίζει ελάχιστο περιεχόμενο του περιβάλλοντος εργασίας + χρήστη χωρίς μηνύματα ή δεν εμφανίζει περιβάλλον εργασίας χρήστη και + μηνύματα. Από προεπιλογή, εμφανίζονται όλα τα μηνύματα και το περιβάλλον + εργασίας χρήστη. + +/norestart - αποκρύπτει οποιεσδήποτε προσπάθειες για επανεκκίνηση. Από + προεπιλογή, το περιβάλλον εργασίας χρήστη θα εμφανίσει μήνυμα πριν από την + επανεκκίνηση. +/log log.txt - πραγματοποιεί καταγραφή σε ένα συγκεκριμένο αρχείο. Από + προεπιλογή, δημιουργείται ένα αρχείο καταγραφής στο %TEMP%. + &Κλείσιμο + Κάντε κλικ στο κουμπί "Αποδοχή και εγκατάσταση" για να αποδεχτείτε τους <a href="#">όρους της άδειας χρήσης</a> του Microsoft .NET Framework. + &Αποδοχή και εγκατάσταση + &Απόρριψη + Πρόοδος εγκατάστασης + Επεξεργασία: + &Άκυρο + Αποτυχία εγκατάστασης + Ένα ή περισσότερα προβλήματα προκάλεσαν την αποτυχία της εγκατάστασης. Διορθώστε τα προβλήματα και μετά επαναλάβετε την εγκατάσταση. Για περισσότερες πληροφορίες, ανατρέξτε στο <a href="#">αρχείο καταγραφής</a>. + Για να ολοκληρωθεί η επαναφορά του λογισμικού, πρέπει να κάνετε επανεκκίνηση του υπολογιστή. + &Επανεκκίνηση + &Κλείσιμο + diff --git a/src/wixstdba/Resources/1035/mbapreq.wxl b/src/wixstdba/Resources/1035/mbapreq.wxl new file mode 100644 index 00000000..859e5b23 --- /dev/null +++ b/src/wixstdba/Resources/1035/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] -asennus + Microsoft .NET Framework tarvitaan [WixBundleName] -asennusta varten + Haluatko varmasti peruuttaa? + Asennusohjelman ohje + /passive | /quiet - näyttää mahdollisimman vähän käyttöliittymästä; ei + kehotteita tai ei käyttöliittymää ja kehotteita. Oletusarvoisesti + käyttöliittymä ja kaikki kehotteet näytetään. + +/norestart - estää uudelleenkäynnistysyritykset. Oletusarvoisesti + käyttöliittymä kysyy ennen uudelleenkäynnistystä. +/log loki.txt - kirjaa lokitiedot erityiseen tiedostoon. Oletusarvoisesti + lokitiedosto luodaan %TEMP%-kansioon. + &Sulje + Hyväksy Microsoft .NET Framework -ohjelman <a href="#">käyttöoikeusehdot</a> valitsemalla Hyväksy ja asenna. + &Hyväksy ja asenna + &Hylkää + Asennuksen edistyminen + Käsitellään: + &Peruuta + Asennus epäonnistui + Asennus epäonnistui yhdestä tai useammasta syystä. Korjaa ongelmat ja yritä suorittaa asennus sitten uudelleen. Lisätietoja on <a href="#">lokitiedostossa</a>. + Tietokone täytyy käynnistää uudelleen ohjelmiston palautuksen viimeistelemiseksi. + &Käynnistä uudelleen + &Sulje + diff --git a/src/wixstdba/Resources/1036/mbapreq.wxl b/src/wixstdba/Resources/1036/mbapreq.wxl new file mode 100644 index 00000000..f67dfa8e --- /dev/null +++ b/src/wixstdba/Resources/1036/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + Installation de [WixBundleName] + Microsoft .NET Framework requis pour l'installation de [WixBundleName] + Êtes-vous sûr de vouloir annuler ? + Aide de l'installation + /passive | /quiet - affiche une interface minimale sans invites ou n'affiche + aucune interface ni aucune invite. Par défaut, l'interface et toutes les + invites sont affichées. + +/norestart - annule toute tentative de redémarrage. Par défaut, l'interface + affiche une invite avant de redémarrer. +/log journal.txt - consigne les entrées de journal dans un fichier spécifique. + Par défaut, un fichier journal est créé dans %TEMP%. + &Fermer + Cliquez sur le bouton « Accepter et installer » pour accepter les <a href="#">termes du contrat de licence</a> Microsoft .NET Framework. + &Accepter et installer + &Refuser + Progression de l'installation + Traitement en cours : + &Annuler + L'installation a échoué + L'installation a échoué pour une ou plusieurs raisons. Corrigez les problèmes et recommencez l'installation. Pour plus d'informations, consultez le <a href="#">fichier journal</a>. + Vous devez redémarrer votre ordinateur pour effectuer la restauration du logiciel. + &Redémarrer + &Fermer + diff --git a/src/wixstdba/Resources/1038/mbapreq.wxl b/src/wixstdba/Resources/1038/mbapreq.wxl new file mode 100644 index 00000000..6a4b109d --- /dev/null +++ b/src/wixstdba/Resources/1038/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] telepítő + A(z) [WixBundleName] telepítéséhez Microsoft .NET-keretrendszer szükséges + Biztosan megszakítja? + A telepítő súgója + /passive | /quiet - Minimális felhasználói felület megjelenítése kérdések + nélkül, illetve felhasználói felület és kérdések megjelenítése nélküli + telepítés. Alapesetben a felhasználói felület és minden kérdés megjelenik. + +/norestart - Az újraindítási kérések elrejtése. Alapesetben a felhasználói + felületen megjelennek az újraindítási kérések. +/log naplo.txt - Naplózás a megadott fájlba. Alapesetben a naplófájl a %TEMP% + könyvtárban jön létre. + &Bezárás + A Microsoft .NET-keretrendszer <a href="#">licencszerződésének</a> elfogadásához kattintson az „Elfogadás és telepítés” gombra. + &Elfogadás és telepítés + &Elutasítás + Telepítési folyamat + Feldolgozás: + &Mégse + A telepítés nem sikerült + Legalább egy olyan hiba lépett fel, amely a telepítés meghiúsulását okozta. Hárítsa el a hibákat, majd futtassa újra a telepítőt. További információt a <a href="#">naplófájlban </a> talál. + A szoftver visszaállításának befejezéséhez újra kell indítania a számítógépet. + &Újraindítás + &Bezárás + diff --git a/src/wixstdba/Resources/1040/mbapreq.wxl b/src/wixstdba/Resources/1040/mbapreq.wxl new file mode 100644 index 00000000..f57d58e5 --- /dev/null +++ b/src/wixstdba/Resources/1040/mbapreq.wxl @@ -0,0 +1,31 @@ + + + + + + Installazione di [WixBundleName] + Microsoft .NET Framework necessario per l'installazione di [WixBundleName] + Annullare? + Guida dell'installazione + /passive | /quiet - visualizza l'interfaccia utente minima senza istruzioni + oppure non visualizza né l'interfaccia utente né le istruzioni. Per + impostazione predefinita vengono visualizzate interfaccia utente e + istruzioni. + +/norestart - elimina eventuali tentativi di riavvio. Per impostazione + predefinita l'interfaccia utente chiede istruzioni prima del riavvio. +/log log.txt - registra in un file specifico. Per impostazione predefinita un + file di log viene creato in %TEMP%. + &Chiudi + Fare clic sul pulsante "Accetta e installa" per accettare le <a href="#">condizioni di licenza</a> di Microsoft .NET Framework. + &Accetta e installa + &Rifiuta + Stato installazione + Elaborazione in corso: + &Annulla + Installazione non riuscita + L'installazione non è riuscita a causa di uno o più problemi. Risolvere i problemi e provare di nuovo l'installazione. Per ulteriori informazioni vedere il <a href="#">file di log</a>. + È necessario riavviare il computer per completare il rollback del software. + &Riavvia + &Chiudi + diff --git a/src/wixstdba/Resources/1041/mbapreq.wxl b/src/wixstdba/Resources/1041/mbapreq.wxl new file mode 100644 index 00000000..3fe7b9b3 --- /dev/null +++ b/src/wixstdba/Resources/1041/mbapreq.wxl @@ -0,0 +1,27 @@ + + + + + + [WixBundleName] セットアップ + [WixBundleName] セットアップには Microsoft .NET Framework が必要です + 取り消しますか? + セットアップのヘルプ + /passive | /quiet - 最小の UI だけを表示してプロンプトは表示しないか、UI + もプロンプトも表示しません。 既定では、UI とすべてのプロンプトが表示されます。 + +/norestart - 再起動の試みをすべて抑制します。既定では、再起動の前に UI によりプロンプトが表示されます。 +/log log.txt - 特定のファイルにログを記録します。既定では、%TEMP% にログ ファイルが作成されます。 + 閉じる(&C) + Microsoft .NET Framework の<a href="#">ライセンス条項</a>に同意する場合は、［同意してインストール］5D; ボタンをクリックします。 + 同意してインストール(&A) + 同意しない(&) + セットアップの進行状況 + 処理中: + キャンセル(&C) + セットアップに失敗しました + 1 つ以上の問題が原因でセットアップに失敗しました。問題を解決してからセットアップをやり直してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。 + ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。 + 再起動(&R) + 閉じる(&C) + diff --git a/src/wixstdba/Resources/1042/mbapreq.wxl b/src/wixstdba/Resources/1042/mbapreq.wxl new file mode 100644 index 00000000..0f53dcc3 --- /dev/null +++ b/src/wixstdba/Resources/1042/mbapreq.wxl @@ -0,0 +1,27 @@ + + + + + + [WixBundleName] 설치 + [WixBundleName] 설치에 필요한 Microsoft .NET Framework + 취소하시겠습니까? + 설치 도움말 + /passive | /quiet - 메시지 없이 최소 UI를 표시하거나 UI와 메시지를 전혀 + 표시하지 않습니다. 기본적으로 UI 및 모든 메시지는 표시됩니다. + +/norestart - 다시 시작하려는 시도를 무시합니다. 기본적으로 UI는 다시 시작하기 전에 메시지를 표시합니다. +/log log.txt - 특정 파일에 기록합니다. 기본적으로 로그 파일이 %TEMP%에 생성됩니다. + 닫기(&C) + Microsoft .NET Framework <a href="#">사용 조건</a>에 동의하려면 "동의 및 설치"를 클릭하십시오. + 동의 및 설치(&A) + 동의 안 함(&D) + 설치 진행률 + 처리 중: + 취소(&C) + 설치 실패 + 하나 이상의 문제로 인해 설치에 실패했습니다. 문제를 수정하고 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오. + 소프트웨어의 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. + 다시 시작(&R) + 닫기(&C) + diff --git a/src/wixstdba/Resources/1043/mbapreq.wxl b/src/wixstdba/Resources/1043/mbapreq.wxl new file mode 100644 index 00000000..f4a2c78c --- /dev/null +++ b/src/wixstdba/Resources/1043/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] Installatie + Microsoft .NET Framework is vereist voor installatie [WixBundleName] + Weet u zeker dat u de installatie wilt annuleren? + Help bij Setup + /passive | /quiet - geeft een minimale gebruikersinterface weer zonder prompts + of geeft geen gebruikersinterface en geen prompts weer. Gebruikersinterface + en alle prompts worden standaard weergegeven. + +/norestart - pogingen tot opnieuw opstarten onderdrukken. + Gebruikersinterface vraagt standaard alvorens opnieuw op te starten. +/log log.txt - registreert gegevens in een specifiek bestand. Een logbestand + wordt standaard in %TEMP% gemaakt. + &Sluiten + Klik op de knop 'Accepteren en installeren' om de <a href="#">licentievoorwaarden</a> van het Microsoft .NET Framework te accepteren. + &Accepteren en installeren + &Weigeren + Voortgang van de installatie + Verwerken: + &Annuleren + Installatie mislukt + Er zijn een of meer fouten opgetreden waardoor de installatie is mislukt. Corrigeer de problemen en voer Setup opnieuw uit. Raadpleeg het <a href="#">log boekbestand</a> voor meer informatie. + U moet uw computer opnieuw opstarten om het terugdraaien van de software te voltooien. + &Opnieuw opstarten + &Sluiten + diff --git a/src/wixstdba/Resources/1044/mbapreq.wxl b/src/wixstdba/Resources/1044/mbapreq.wxl new file mode 100644 index 00000000..da5c8283 --- /dev/null +++ b/src/wixstdba/Resources/1044/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] Installasjonsprogram + Microsoft .NET Framework kreves for [WixBundleName]-installasjon + Er du sikker på at du vil avbryte? + Installasjonshjelp + /passive | /quiet - viser minimalt brukergrensesnitt uten ledetekster, eller + ikke noe brukergrensesnitt og ingen ledetekster. Som standard vises + brukergrensesnitt og alle ledetekster. + +/norestart - undertrykker alle forsøk på omstart. Som standard spør + brukergrensesnittet før omstart. +/log log.txt - skriver logg til en bestemt fil. Som standard opprettes en + loggfil i %TEMP%. + &Lukk + Klikk Godta og installer for å godta<a href="#">lisensvilkårene</a> for Microsoft .NET Framework. + &Godta og installer + &Avslå + Fremdrift for installasjon + Behandler: + &Avbryt + Installasjon mislyktes + Ett eller flere problemer var årsak til at installasjonen mislyktes. Løs problemene, og installer på nytt. Du finner flere opplysninger i <a href="#">loggfilen</a>. + Du må starte datamaskinen på nytt for å fullføre tilbakerullingen av programvaren. + &Start på nytt + &Lukk + diff --git a/src/wixstdba/Resources/1045/mbapreq.wxl b/src/wixstdba/Resources/1045/mbapreq.wxl new file mode 100644 index 00000000..7aca87c2 --- /dev/null +++ b/src/wixstdba/Resources/1045/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + Instalator programu [WixBundleName] + Do zainstalowania programu [WixBundleName] jest wymagany program Microsoft .NET Framework + Czy na pewno chcesz anulować? + Pomoc instalatora + /passive | /quiet - wyświetla minimalny interfejs użytkownika bez monitów + lub nie wyświetla interfejsu użytkownika ani monitów. Domyślnie jest + wyświetlany interfejs użytkownika i wszystkie monity. + +/norestart - pomija wszelkie próby ponownego uruchomienia. Domyślnie + interfejs użytkownika będzie wyświetlał monit przed ponownym uruchomieniem. +/log log.txt - zapisuje wpisy dziennika do określonego pliku. + Domyślnie plik dziennika jest tworzony w folderze %TEMP%. + &Zamknij + Kliknij przycisk Zaakceptuj i zainstaluj, aby zaakceptować <a href="#">warunki licencji</a> programu Microsoft .NET Framework. + &Zaakceptuj i zainstaluj + &Odrzuć + Postęp instalacji + Trwa przetwarzanie: + &Anuluj + Instalacja nie powiodła się + Co najmniej jeden problem spowodował niepowodzenie instalacji. Usuń problemy, a następnie ponów próbę instalacji. Aby uzyskać więcej informacji można znaleźć w <a href="#">pliku dziennika</a>. + Aby zakończyć wycofywanie oprogramowania, musisz ponownie uruchomić komputer. + &Uruchom ponownie + &Zamknij + diff --git a/src/wixstdba/Resources/1046/mbapreq.wxl b/src/wixstdba/Resources/1046/mbapreq.wxl new file mode 100644 index 00000000..be185502 --- /dev/null +++ b/src/wixstdba/Resources/1046/mbapreq.wxl @@ -0,0 +1,29 @@ + + + + + + [WixBundleName] Instalação + Microsoft .NET Framework é necessário para instalação do [WixBundleName] + Tem certeza de que deseja cancelar? + Ajuda da Instalação + /passive | /quiet - exibe UI mínima sem avisos ou exibe sem UI e + sem avisos. Por padrão a UI e todos avisos são exibidos. + +/norestart - suprime qualquer tentativa de reinicialização. Por padrão a UI + irá solicitar antes de reiniciar. +/log log.txt - logs para um arquivo específico. Por padrão um arquivo de log é + criado em %TEMP%. + &Fechar + Clique o botão "Aceitar e Instalar" para aceitar os termos de licença do Microsoft .NET Framework <a href="#"></a>. + &Aceitar e Instalar + &Recusar + Progresso da Instalação + Processando: + &Cancelar + Falha na Instalação + Um ou mais problemas causaram falha na instalação. Corrija os problemas e tente a instalação novamente. Para mais informações consulte o <a href="#">arquivo de log</a>. + Você deve reiniciar o computador para completar a reversão do software. + &Reiniciar + &Fechar + diff --git a/src/wixstdba/Resources/1049/mbapreq.wxl b/src/wixstdba/Resources/1049/mbapreq.wxl new file mode 100644 index 00000000..a1aec7ed --- /dev/null +++ b/src/wixstdba/Resources/1049/mbapreq.wxl @@ -0,0 +1,29 @@ + + + + + + Установка [WixBundleName] + Для установки [WixBundleName] требуется Microsoft .NET Framework + Вы действительно хотите отменить операцию? + Справка по установке + /passive | /quiet - отображение минимального ИП без запросов или работа без ИП + и беззапросов. По умолчанию отображаются ИП и все запросы. + +/norestart - отключение всех попыток перезагрузки. По умолчанию в ИП перед + перезагрузкой отображается запрос. +/log log.txt - запись журнала в указанный файл. По умолчанию файл журнала + создается в папке %TEMP%. + &Закрыть + Нажмите кнопку "Принять и установить", чтобы принять <a href="#">условия лицензии</a> Microsoft .NET Framework. + &Принять и установить + &Отклонить + Выполнение установки + Обработка: + &Отмена + Сбой установки + Не удалось выполнить установку из-за одной или нескольких проблем. Устраните эти проблемы, а затем снова запустите программу установки. Дополнительные сведения см. в <a href="#">файле журнала</a>. + Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. + &Перезагрузить + &Закрыть + diff --git a/src/wixstdba/Resources/1051/mbapreq.wxl b/src/wixstdba/Resources/1051/mbapreq.wxl new file mode 100644 index 00000000..9f0b4711 --- /dev/null +++ b/src/wixstdba/Resources/1051/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] – inštalácia + Na inštaláciu aplikácie [WixBundleName] sa vyžaduje súčasť Microsoft .NET Framework + Naozaj chcete zrušiť operáciu? + Pomocník pre inštaláciu + /passive | /quiet – zobrazí minimálne používateľské rozhranie bez výziev alebo + nezobrazí žiadne používateľské rozhranie ani výzvy. Predvolene sa + zobrazuje používateľské rozhranie aj všetky výzvy. + +/norestart – zruší všetky pokusy o reštart. Používateľské rozhranie + predvolene zobrazí pred reštartom výzvu. +/log log.txt – urobí záznam do určeného súboru. Súbor denníka sa predvolene + vytvorí v priečinku %TEMP%. + &Zavrieť + Kliknutím na tlačidlo Súhlasiť a inštalovať vyjadrite svoj súhlas s <a href="#">licenčnými podmienkami</a> súčasti Microsoft .NET Framework. + &Súhlasiť a inštalovať + &Odmietnuť + Priebeh inštalácie + Spracúva sa: + &Zrušiť + Inštalácia zlyhala + Inštalácia zlyhala pre jednu alebo viac príčin. Odstráňte problémy a skúste znova spustiť inštaláciu. Ďalšie informácie nájdete v <a href="#">súbore denníka</a>. + Dokončenie všetkých zmien softvéru vyžaduje reštart počítača. + &Reštartovať + &Zavrieť + diff --git a/src/wixstdba/Resources/1053/mbapreq.wxl b/src/wixstdba/Resources/1053/mbapreq.wxl new file mode 100644 index 00000000..72961409 --- /dev/null +++ b/src/wixstdba/Resources/1053/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName]-installation + Microsoft .NET Framework krävs för installation av [WixBundleName] + Vill du avbryta? + Installationshjälp + /passive | /quiet - visar ett minimalt användargränssnitt utan prompter, + alternativt inget användargränssnitt och inga prompter. Som standard visas + användargränssnitt och samtliga prompter. + +/norestart - hejdar omstart. Som standard visar användargränssnittet en + prompt före omstart. +/log log.txt - skapar logg till en specifik fil. Som standard skapas loggfilen + i %TEMP%. + &Stäng + Klicka på knappen "Godkänn och installera" för att godkänna <a href="#">licensvillkoren</a> för Microsoft .NET Framework. + &Godkänn och installera + &Avbryt + Installationsförlopp + Bearbetar: + &Avbryt + Installationen misslyckades + Installationen misslyckades på grund av ett eller flera problem. Åtgärda problemen och försök igen. Se <a href="#">loggfilen</a> för mer information. + Starta om datorn för att återställa programmet. + &Starta om + &Stäng + diff --git a/src/wixstdba/Resources/1055/mbapreq.wxl b/src/wixstdba/Resources/1055/mbapreq.wxl new file mode 100644 index 00000000..ee52da98 --- /dev/null +++ b/src/wixstdba/Resources/1055/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] Kurulumu + [WixBundleName] kurulumu için Microsoft .NET Framework gerekir + İptal etmek istediğinizden emin misiniz? + Kurulum Yardımı + /passive | /quiet - komut istemi olmayan olabildiğince küçük bir UI + görüntüler veya komut istemi ve UI görüntülemez. Varsayılan olarak UI + ve tüm komut istemleri görüntülenir. + +/norestart - yeniden başlatma denemelerini engeller. Varsayılan + olarak UI yeniden başlatmadan önce komut isteyecektir. +/log log.txt - belirli bir dosyayı günlük dosyası olarak kullanır. + Varsayılan olarak %TEMP% konumunda bir günlük dosyası oluşturulur. + &Kapat + Microsoft .NET Framework <a href="#">lisans şartlarını</a> kabul etmek için "Kabul Et ve Yükle" düğmesini tıklatın. + &Kabul Et ve Yükle + &Reddet + Kurulum İlerleme Durumu + İşleniyor: + &İptal + Kurulum Başarısız + Bir veya daha fazla sorun kurulumun başarısız olmasına neden oldu. Lütfen sorunları çözün ve kurulumu yeniden deneyin. Daha fazla bilgi için <a href="#">günlük dosyasına</a> bakın. + Yazılım geri alma işlemini tamamlamak için bilgisayarınızı yeniden başlatmanız gerekir. + &Yeniden Başlat + &Kapat + diff --git a/src/wixstdba/Resources/1060/mbapreq.wxl b/src/wixstdba/Resources/1060/mbapreq.wxl new file mode 100644 index 00000000..f3b4bfe5 --- /dev/null +++ b/src/wixstdba/Resources/1060/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] Namestitev + Microsoft .NET Framework, potreben za namestitev paketa [WixBundleName] + Ali ste prepričani, da želite preklicati? + Pomoč za namestitev + /passive | /quiet - prikaže minimalni uporabniški vmesnik brez pozivov ali ne prikaže + uporabniškega vmesnika in pozivov. Privzeto so prikazani uporabniški vmesnik in + vsi pozivi. + +/norestart - skrije vse možnosti za vnovicni zagon. Privzeto uporabniški vmesnik + prikaže poziv pred ponovnim zagonom. +/log log.txt - beleži vnose v dnevnik v doloceno datoteko. Privzeto je datoteko + ustvarjena v mapi %TEMP%. + &Zapri + Kliknite »Sprejmi in namesti« in sprejmite <a href="#">licenčne pogoje</a> za Microsoft .NET Framework. + &Sprejmi in namesti + &Zavrni + Potek namestitve + Obdelovanje: + &Prekliči + Namestitev ni uspela + Namestitev ni uspela zaradi ene ali več težav. Odpravite težave in ponovno zaženite namestitev. Za več informacij glejte <a href="#">dnevniško datoteko</a>. + Za povrnitev prejšnjega stanja programske opreme morate ponovno zagnati računalnik. + &Ponovni zagon + &Zapri + diff --git a/src/wixstdba/Resources/2052/mbapreq.wxl b/src/wixstdba/Resources/2052/mbapreq.wxl new file mode 100644 index 00000000..63cdb418 --- /dev/null +++ b/src/wixstdba/Resources/2052/mbapreq.wxl @@ -0,0 +1,27 @@ + + + + + + [WixBundleName] 安装 + [WixBundleName] 安装需要 Microsoft .NET Framework + 是否确实要取消? + 安装程序帮助 + /passive | /quiet - 显示最小的 UI 且无提示，或者不显示 UI 且 + 无提示。默认情况下显示 UI 和所有提示。 + +/norestart - 隐藏任何重启提示。默认情况下 UI 会在重启前提示。 +/log log.txt - 记录到特定文件。默认情况下在 %TEMP% 中创建日志文件。 + 关闭(&C) + 单击“接受并安装”按钮以接受 Microsoft .NET Framework <a href="#">许可证条款</a>。 + 接受并安装(&A) + 拒绝(&D) + 安装进度 + 正在处理: + 取消(&C) + 安装失败 + 一个或多个问题导致安装失败。请解决问题，然后重新尝试安装。有关详情，请查看<a href="#">日志文件</a>。 + 必须重启计算机才能完成软件的回滚。 + 重启(&R) + 关闭(&C) + diff --git a/src/wixstdba/Resources/2070/mbapreq.wxl b/src/wixstdba/Resources/2070/mbapreq.wxl new file mode 100644 index 00000000..6a49ca31 --- /dev/null +++ b/src/wixstdba/Resources/2070/mbapreq.wxl @@ -0,0 +1,29 @@ + + + + + + Configuração do [WixBundleName] + O Microsoft .NET Framework é necessário para a configuração do [WixBundleName] + Tem a certeza de que pretende cancelar? + Ajuda da Configuração + /passive | /quiet - apresenta IU mínima sem mensagens ou não apresenta IU nem + mensagens. Por predefinição, são apresentadas a IU e todas as mensagens. + +/norestart - suprimir qualquer tentativa de reinício. Por predefinição, a IU + avisará antes de reiniciar. +/log log.txt - regista num ficheiro específico. Por predefinição, é criado um + ficheiro de registo em %TEMP%. + &Fechar + Clique no botão "Aceitar e Instalar" para aceitar os <a href="#">termos de licenciamento</a> do Microsoft .NET Framework. + &Aceitar e Instalar + &Recusar + Progresso da Configuração + A processar: + &Cancelar + Falha da Configuração + Um ou mais problemas provocaram a falha da configuração. Corrija os problemas e repita a configuração. Para mais informações, consulte o <a href="#">ficheiro de registo</a>. + Tem de reiniciar o computador para concluir a reversão do software. + &Reiniciar + &Fechar + diff --git a/src/wixstdba/Resources/3082/mbapreq.wxl b/src/wixstdba/Resources/3082/mbapreq.wxl new file mode 100644 index 00000000..0290624c --- /dev/null +++ b/src/wixstdba/Resources/3082/mbapreq.wxl @@ -0,0 +1,31 @@ + + + + + + Instalación de [WixBundleName] + La instalación de [WixBundleName] requiere Microsoft .NET Framework + ¿Está seguro de que desea cancelar? + Ayuda del programa de instalación + /passive | /quiet - muestra una interfaz de usuario mínima y no realiza + preguntas, o bien no muestra interfaz de usuario y no realiza preguntas. + De manera predeterminada se muestra la interfaz de usuario completa y se + realizan todas las preguntas necesarias. + +/norestart - suprime cualquier intento de reinicio. De manera predeterminada, + la interfaz de usuario preguntará si se desea reiniciar. +/log log.txt - registra los datos de instalación en un archivo específico. + De manera predeterminada se crea un archivo de registro en %TEMP%. + &Cerrar + Haga clic en el botón "Aceptar e instalar" para aceptar los <a href="#">términos de licencia</a> de Microsoft .NET Framework. + &Aceptar e instalar + &Rechazar + Progreso de la instalación + Procesando: + &Cancelar + Error de la instalación + No se pudo completar la instalación a causa de uno o varios problemas. Corrija los problemas y vuelva a intentar la instalación. Para más información, vea el <a href="#">archivo de registro</a>. + Debe reiniciar el equipo para completar la reversión del software. + &Reiniciar + &Cerrar + diff --git a/src/wixstdba/Resources/HyperlinkLargeTheme.xml b/src/wixstdba/Resources/HyperlinkLargeTheme.xml new file mode 100644 index 00000000..9aff929f --- /dev/null +++ b/src/wixstdba/Resources/HyperlinkLargeTheme.xml @@ -0,0 +1,109 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + + #(loc.InstallLicenseLinkText) + + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/wixstdba/Resources/HyperlinkSidebarTheme.xml b/src/wixstdba/Resources/HyperlinkSidebarTheme.xml new file mode 100644 index 00000000..24a53583 --- /dev/null +++ b/src/wixstdba/Resources/HyperlinkSidebarTheme.xml @@ -0,0 +1,120 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + + + #(loc.InstallLicenseLinkText) + + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/wixstdba/Resources/HyperlinkTheme.wxl b/src/wixstdba/Resources/HyperlinkTheme.wxl new file mode 100644 index 00000000..e6e3f8ab --- /dev/null +++ b/src/wixstdba/Resources/HyperlinkTheme.wxl @@ -0,0 +1,61 @@ + + + + + + [WixBundleName] Setup + [WixBundleName] + Welcome + Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit. + Version [WixBundleVersion] + Are you sure you want to cancel? + Previous version + Setup Help + /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or + creates a complete local copy of the bundle in directory. Install is the default. + +/passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + [WixBundleName] <a href="#">license terms</a>. + I &agree to the license terms and conditions + &Options + &Install + &Cancel + Setup Options + Install location: + &Browse + &OK + &Cancel + Setup Progress + Processing: + Initializing... + &Cancel + Modify Setup + &Repair + &Uninstall + &Cancel + Setup Successful + Installation Successfully Completed + Layout Successfully Completed + Repair Successfully Completed + Uninstall Successfully Completed + &Launch + You must restart your computer before you can use the software. + You must restart your computer to complete the removal of the software. + &Restart + &Close + Setup Failed + Setup Failed + Layout Failed + Repair Failed + Uninstall Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + No action was taken as a system reboot is required. + diff --git a/src/wixstdba/Resources/HyperlinkTheme.xml b/src/wixstdba/Resources/HyperlinkTheme.xml new file mode 100644 index 00000000..51a5be5b --- /dev/null +++ b/src/wixstdba/Resources/HyperlinkTheme.xml @@ -0,0 +1,106 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + #(loc.InstallLicenseLinkText) + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/wixstdba/Resources/LoremIpsumLicense.rtf b/src/wixstdba/Resources/LoremIpsumLicense.rtf new file mode 100644 index 00000000..1a183236 Binary files /dev/null and b/src/wixstdba/Resources/LoremIpsumLicense.rtf differ diff --git a/src/wixstdba/Resources/RtfLargeTheme.xml b/src/wixstdba/Resources/RtfLargeTheme.xml new file mode 100644 index 00000000..2a87f912 --- /dev/null +++ b/src/wixstdba/Resources/RtfLargeTheme.xml @@ -0,0 +1,108 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/wixstdba/Resources/RtfTheme.wxl b/src/wixstdba/Resources/RtfTheme.wxl new file mode 100644 index 00000000..f73fb994 --- /dev/null +++ b/src/wixstdba/Resources/RtfTheme.wxl @@ -0,0 +1,58 @@ + + + + + + [WixBundleName] Setup + [WixBundleName] + Version [WixBundleVersion] + Are you sure you want to cancel? + Previous version + Setup Help + /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or + creates a complete local copy of the bundle in directory. Install is the default. + +/passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + I &agree to the license terms and conditions + &Options + &Install + &Cancel + Setup Options + Install location: + &Browse + &OK + &Cancel + Setup Progress + Processing: + Initializing... + &Cancel + Modify Setup + &Repair + &Uninstall + &Cancel + Setup Successful + Installation Successfully Completed + Layout Successfully Completed + Repair Successfully Completed + Uninstall Successfully Completed + &Launch + You must restart your computer before you can use the software. + You must restart your computer to complete the removal of the software. + &Restart + &Close + Setup Failed + Setup Failed + Layout Failed + Repair Failed + Uninstall Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + No action was taken as a system reboot is required. + diff --git a/src/wixstdba/Resources/RtfTheme.xml b/src/wixstdba/Resources/RtfTheme.xml new file mode 100644 index 00000000..6654c3f2 --- /dev/null +++ b/src/wixstdba/Resources/RtfTheme.xml @@ -0,0 +1,106 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/wixstdba/Resources/logo.png b/src/wixstdba/Resources/logo.png new file mode 100644 index 00000000..7adc6e11 Binary files /dev/null and b/src/wixstdba/Resources/logo.png differ diff --git a/src/wixstdba/Resources/logoSide.png b/src/wixstdba/Resources/logoSide.png new file mode 100644 index 00000000..308841c5 Binary files /dev/null and b/src/wixstdba/Resources/logoSide.png differ diff --git a/src/wixstdba/Resources/mbapreq.png b/src/wixstdba/Resources/mbapreq.png new file mode 100644 index 00000000..c6e9527b Binary files /dev/null and b/src/wixstdba/Resources/mbapreq.png differ diff --git a/src/wixstdba/Resources/mbapreq.thm b/src/wixstdba/Resources/mbapreq.thm new file mode 100644 index 00000000..4ae61819 --- /dev/null +++ b/src/wixstdba/Resources/mbapreq.thm @@ -0,0 +1,47 @@ + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + #(loc.InstallLicenseTerms) + + + + + + + + + + + + + #(loc.FailureLogLinkText) + + + + + + + diff --git a/src/wixstdba/Resources/mbapreq.wxl b/src/wixstdba/Resources/mbapreq.wxl new file mode 100644 index 00000000..95e3a6ae --- /dev/null +++ b/src/wixstdba/Resources/mbapreq.wxl @@ -0,0 +1,29 @@ + + + + + + [WixBundleName] Setup + Microsoft .NET Framework required for [WixBundleName] setup + Are you sure you want to cancel? + Setup Help + /passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + Click the "Accept and Install" button to accept the Microsoft .NET Framework <a href="#">license terms</a>. + &Accept and Install + &Decline + Setup Progress + Processing: + &Cancel + Setup Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. + diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp new file mode 100644 index 00000000..6d2fd3e2 --- /dev/null +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -0,0 +1,3849 @@ +// 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. + +#include "precomp.h" +#include "BalBaseBootstrapperApplicationProc.h" +#include "BalBaseBootstrapperApplication.h" + +static const LPCWSTR WIXBUNDLE_VARIABLE_ELEVATED = L"WixBundleElevated"; + +static const LPCWSTR WIXSTDBA_WINDOW_CLASS = L"WixStdBA"; + +static const LPCWSTR WIXSTDBA_VARIABLE_INSTALL_FOLDER = L"InstallFolder"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH = L"LaunchTarget"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID = L"LaunchTargetElevatedId"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS = L"LaunchArguments"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_HIDDEN = L"LaunchHidden"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER = L"LaunchWorkingFolder"; + +static const DWORD WIXSTDBA_ACQUIRE_PERCENTAGE = 30; + +static const LPCWSTR WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION = L"WixBundleFileVersion"; +static const LPCWSTR WIXSTDBA_VARIABLE_LANGUAGE_ID = L"WixStdBALanguageId"; +static const LPCWSTR WIXSTDBA_VARIABLE_RESTART_REQUIRED = L"WixStdBARestartRequired"; +static const LPCWSTR WIXSTDBA_VARIABLE_SHOW_VERSION = L"WixStdBAShowVersion"; +static const LPCWSTR WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI = L"WixStdBASuppressOptionsUI"; + +enum WIXSTDBA_STATE +{ + WIXSTDBA_STATE_INITIALIZING, + WIXSTDBA_STATE_INITIALIZED, + WIXSTDBA_STATE_HELP, + WIXSTDBA_STATE_DETECTING, + WIXSTDBA_STATE_DETECTED, + WIXSTDBA_STATE_PLANNING, + WIXSTDBA_STATE_PLANNED, + WIXSTDBA_STATE_APPLYING, + WIXSTDBA_STATE_CACHING, + WIXSTDBA_STATE_CACHED, + WIXSTDBA_STATE_EXECUTING, + WIXSTDBA_STATE_EXECUTED, + WIXSTDBA_STATE_APPLIED, + WIXSTDBA_STATE_FAILED, +}; + +enum WM_WIXSTDBA +{ + WM_WIXSTDBA_SHOW_HELP = WM_APP + 100, + WM_WIXSTDBA_DETECT_PACKAGES, + WM_WIXSTDBA_PLAN_PACKAGES, + WM_WIXSTDBA_APPLY_PACKAGES, + WM_WIXSTDBA_CHANGE_STATE, + WM_WIXSTDBA_SHOW_FAILURE, +}; + +// This enum must be kept in the same order as the vrgwzPageNames array. +enum WIXSTDBA_PAGE +{ + WIXSTDBA_PAGE_LOADING, + WIXSTDBA_PAGE_HELP, + WIXSTDBA_PAGE_INSTALL, + WIXSTDBA_PAGE_MODIFY, + WIXSTDBA_PAGE_PROGRESS, + WIXSTDBA_PAGE_PROGRESS_PASSIVE, + WIXSTDBA_PAGE_SUCCESS, + WIXSTDBA_PAGE_FAILURE, + COUNT_WIXSTDBA_PAGE, +}; + +// This array must be kept in the same order as the WIXSTDBA_PAGE enum. +static LPCWSTR vrgwzPageNames[] = { + L"Loading", + L"Help", + L"Install", + L"Modify", + L"Progress", + L"ProgressPassive", + L"Success", + L"Failure", +}; + +enum WIXSTDBA_CONTROL +{ + // Welcome page + WIXSTDBA_CONTROL_INSTALL_BUTTON = THEME_FIRST_ASSIGN_CONTROL_ID, + WIXSTDBA_CONTROL_EULA_RICHEDIT, + WIXSTDBA_CONTROL_EULA_LINK, + WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX, + + // Modify page + WIXSTDBA_CONTROL_REPAIR_BUTTON, + WIXSTDBA_CONTROL_UNINSTALL_BUTTON, + + // Progress page + WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, + WIXSTDBA_CONTROL_CACHE_PROGRESS_BAR, + WIXSTDBA_CONTROL_CACHE_PROGRESS_TEXT, + + WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, + WIXSTDBA_CONTROL_EXECUTE_PROGRESS_BAR, + WIXSTDBA_CONTROL_EXECUTE_PROGRESS_TEXT, + WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, + + WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, + WIXSTDBA_CONTROL_OVERALL_PROGRESS_BAR, + WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, + WIXSTDBA_CONTROL_OVERALL_PROGRESS_TEXT, + + WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, + + // Success page + WIXSTDBA_CONTROL_LAUNCH_BUTTON, + WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, + + // Failure page + WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, + WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, + WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, +}; + +static THEME_ASSIGN_CONTROL_ID vrgInitControls[] = { + { WIXSTDBA_CONTROL_INSTALL_BUTTON, L"InstallButton" }, + { WIXSTDBA_CONTROL_EULA_RICHEDIT, L"EulaRichedit" }, + { WIXSTDBA_CONTROL_EULA_LINK, L"EulaHyperlink" }, + { WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX, L"EulaAcceptCheckbox" }, + + { WIXSTDBA_CONTROL_REPAIR_BUTTON, L"RepairButton" }, + { WIXSTDBA_CONTROL_UNINSTALL_BUTTON, L"UninstallButton" }, + + { WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, L"CacheProgressPackageText" }, + { WIXSTDBA_CONTROL_CACHE_PROGRESS_BAR, L"CacheProgressbar" }, + { WIXSTDBA_CONTROL_CACHE_PROGRESS_TEXT, L"CacheProgressText" }, + { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, L"ExecuteProgressPackageText" }, + { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_BAR, L"ExecuteProgressbar" }, + { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_TEXT, L"ExecuteProgressText" }, + { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, L"ExecuteProgressActionDataText"}, + { WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, L"OverallProgressPackageText" }, + { WIXSTDBA_CONTROL_OVERALL_PROGRESS_BAR, L"OverallProgressbar" }, + { WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, L"OverallCalculatedProgressbar" }, + { WIXSTDBA_CONTROL_OVERALL_PROGRESS_TEXT, L"OverallProgressText" }, + { WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, L"ProgressCancelButton" }, + + { WIXSTDBA_CONTROL_LAUNCH_BUTTON, L"LaunchButton" }, + { WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, L"SuccessRestartButton" }, + + { WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, L"FailureLogFileLink" }, + { WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, L"FailureMessageText" }, + { WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, L"FailureRestartButton" }, +}; + +typedef struct _WIXSTDBA_PREREQ_PACKAGE +{ + LPWSTR sczPackageId; + BOOL fWasAlreadyInstalled; + BOOL fPlannedToBeInstalled; + BOOL fSuccessfullyInstalled; +} WIXSTDBA_PREREQ_PACKAGE; + + +static HRESULT DAPI EvaluateVariableConditionCallback( + __in_z LPCWSTR wzCondition, + __out BOOL* pf, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI FormatVariableStringCallback( + __in_z LPCWSTR wzFormat, + __inout LPWSTR* psczOut, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI GetVariableNumericCallback( + __in_z LPCWSTR wzVariable, + __out LONGLONG* pllValue, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI SetVariableNumericCallback( + __in_z LPCWSTR wzVariable, + __in LONGLONG llValue, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI GetVariableStringCallback( + __in_z LPCWSTR wzVariable, + __inout LPWSTR* psczValue, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI SetVariableStringCallback( + __in_z LPCWSTR wzVariable, + __in_z_opt LPCWSTR wzValue, + __in_opt LPVOID pvContext + ); +static LPCSTR LoggingRequestStateToString( + __in BOOTSTRAPPER_REQUEST_STATE requestState + ); +static LPCSTR LoggingMsiFeatureStateToString( + __in BOOTSTRAPPER_FEATURE_STATE featureState + ); + + +class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplication +{ +public: // IBootstrapperApplication + virtual STDMETHODIMP OnStartup() + { + HRESULT hr = S_OK; + DWORD dwUIThreadId = 0; + + // create UI thread + m_hUiThread = ::CreateThread(NULL, 0, UiThreadProc, this, 0, &dwUIThreadId); + if (!m_hUiThread) + { + ExitWithLastError(hr, "Failed to create UI thread."); + } + + LExit: + return hr; + } + + + virtual STDMETHODIMP OnShutdown( + __inout BOOTSTRAPPER_SHUTDOWN_ACTION* pAction + ) + { + HRESULT hr = S_OK; + + // wait for UI thread to terminate + if (m_hUiThread) + { + ::WaitForSingleObject(m_hUiThread, INFINITE); + ReleaseHandle(m_hUiThread); + } + + // If a restart was required. + if (m_fRestartRequired) + { + if (m_fAllowRestart) + { + *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART; + } + + if (m_fPrereq) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, m_fAllowRestart ? "The prerequisites scheduled a restart. The bootstrapper application will be reloaded after the computer is restarted." + : "A restart is required by the prerequisites but the user delayed it. The bootstrapper application will be reloaded after the computer is restarted."); + } + } + else if (m_fPrereqInstalled) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were successfully installed. The bootstrapper application will be reloaded."); + *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER; + } + else if (m_fPrereqAlreadyInstalled) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop."); + } + else if (m_fPrereq) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were not successfully installed, error: 0x%x. The bootstrapper application will be not reloaded.", m_hrFinal); + } + + return hr; + } + + + virtual STDMETHODIMP OnDetectRelatedBundle( + __in LPCWSTR wzBundleId, + __in BOOTSTRAPPER_RELATION_TYPE relationType, + __in LPCWSTR wzBundleTag, + __in BOOL fPerMachine, + __in DWORD64 dw64Version, + __in BOOTSTRAPPER_RELATED_OPERATION operation, + __inout BOOL* pfCancel + ) + { + BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine); + + // If we're not doing a prerequisite install, remember when our bundle would cause a downgrade. + if (!m_fPrereq && BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE == operation) + { + m_fDowngrading = TRUE; + } + + return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, dw64Version, operation, pfCancel); + } + + + virtual STDMETHODIMP OnDetectPackageComplete( + __in LPCWSTR wzPackageId, + __in HRESULT /*hrStatus*/, + __in BOOTSTRAPPER_PACKAGE_STATE state + ) + { + WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; + BAL_INFO_PACKAGE* pPackage = NULL; + HRESULT hr = GetPrereqPackage(wzPackageId, &pPrereqPackage, &pPackage); + if (SUCCEEDED(hr) && BOOTSTRAPPER_PACKAGE_STATE_PRESENT == state) + { + // If the prerequisite package is already installed, remember that. + pPrereqPackage->fWasAlreadyInstalled = TRUE; + } + + return S_OK; + } + + + virtual STDMETHODIMP OnDetectComplete( + __in HRESULT hrStatus + ) + { + HRESULT hr = S_OK; + + if (SUCCEEDED(hrStatus)) + { + hrStatus = EvaluateConditions(); + + if (m_fPrereq) + { + m_fPrereqAlreadyInstalled = TRUE; + + // At this point we have to assume that all prerequisite packages need to be installed, so set to false if any of them aren't installed. + for (DWORD i = 0; i < m_cPrereqPackages; ++i) + { + if (m_rgPrereqPackages[i].sczPackageId && !m_rgPrereqPackages[i].fWasAlreadyInstalled) + { + m_fPrereqAlreadyInstalled = FALSE; + break; + } + } + } + } + + SetState(WIXSTDBA_STATE_DETECTED, hrStatus); + + if (BOOTSTRAPPER_ACTION_CACHE == m_plannedAction) + { + if (m_fSupportCacheOnly) + { + // Doesn't make sense to prompt the user if cache only is requested. + if (BOOTSTRAPPER_DISPLAY_PASSIVE < m_command.display) + { + m_command.display = BOOTSTRAPPER_DISPLAY_PASSIVE; + } + + m_command.action = BOOTSTRAPPER_ACTION_CACHE; + } + else + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Ignoring attempt to only cache a bundle that does not explicitly support it."); + } + } + + // If we're not interacting with the user or we're doing a layout or we're just after a force restart + // then automatically start planning. + if (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_ACTION_LAYOUT == m_command.action || BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType) + { + if (SUCCEEDED(hrStatus)) + { + ::PostMessageW(m_hWnd, WM_WIXSTDBA_PLAN_PACKAGES, 0, m_command.action); + } + } + + return hr; + } + + + virtual STDMETHODIMP OnPlanRelatedBundle( + __in_z LPCWSTR wzBundleId, + __in BOOTSTRAPPER_REQUEST_STATE recommendedState, + __inout_z BOOTSTRAPPER_REQUEST_STATE* pRequestedState, + __inout BOOL* pfCancel + ) + { + // If we're only installing prerequisites, do not touch related bundles. + if (m_fPrereq) + { + *pRequestedState = BOOTSTRAPPER_REQUEST_STATE_NONE; + } + + return CBalBaseBootstrapperApplication::OnPlanRelatedBundle(wzBundleId, recommendedState, pRequestedState, pfCancel); + } + + + virtual STDMETHODIMP OnPlanPackageBegin( + __in_z LPCWSTR wzPackageId, + __in BOOTSTRAPPER_REQUEST_STATE recommendedState, + __inout BOOTSTRAPPER_REQUEST_STATE *pRequestState, + __inout BOOL* pfCancel + ) + { + HRESULT hr = S_OK; + WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; + BAL_INFO_PACKAGE* pPackage = NULL; + + // If we're planning to install a prerequisite, install it. The prerequisite needs to be installed + // in all cases (even uninstall!) so the BA can load next. + if (m_fPrereq) + { + // Only install prerequisite packages, and check the InstallCondition on prerequisite support packages. + BOOL fInstall = FALSE; + hr = GetPrereqPackage(wzPackageId, &pPrereqPackage, &pPackage); + if (SUCCEEDED(hr) && pPackage) + { + if (pPackage->sczInstallCondition && *pPackage->sczInstallCondition) + { + hr = BalEvaluateCondition(pPackage->sczInstallCondition, &fInstall); + if (FAILED(hr)) + { + fInstall = FALSE; + } + } + else + { + // If the InstallCondition is missing, then it should always be installed. + fInstall = TRUE; + } + + pPrereqPackage->fPlannedToBeInstalled = fInstall; + } + + if (fInstall) + { + *pRequestState = BOOTSTRAPPER_REQUEST_STATE_PRESENT; + } + else + { + *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE; + } + } + else if (m_sczAfterForcedRestartPackage) // after force restart, skip packages until after the package that caused the restart. + { + // After restart we need to finish the dependency registration for our package so allow the package + // to go present. + if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzPackageId, -1, m_sczAfterForcedRestartPackage, -1)) + { + // Do not allow a repair because that could put us in a perpetual restart loop. + if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == *pRequestState) + { + *pRequestState = BOOTSTRAPPER_REQUEST_STATE_PRESENT; + } + + ReleaseNullStr(m_sczAfterForcedRestartPackage); // no more skipping now. + } + else // not the matching package, so skip it. + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Skipping package: %ls, after restart because it was applied before the restart.", wzPackageId); + + *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE; + } + } + + return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, recommendedState, pRequestState, pfCancel); + } + + + virtual STDMETHODIMP OnPlanComplete( + __in HRESULT hrStatus + ) + { + HRESULT hr = S_OK; + + if (m_fPrereq) + { + m_fPrereqAlreadyInstalled = TRUE; + + // Now that we've planned the packages, we can focus on the prerequisite packages that are supposed to be installed. + for (DWORD i = 0; i < m_cPrereqPackages; ++i) + { + if (m_rgPrereqPackages[i].sczPackageId && !m_rgPrereqPackages[i].fWasAlreadyInstalled && m_rgPrereqPackages[i].fPlannedToBeInstalled) + { + m_fPrereqAlreadyInstalled = FALSE; + break; + } + } + } + + SetState(WIXSTDBA_STATE_PLANNED, hrStatus); + + if (SUCCEEDED(hrStatus)) + { + ::PostMessageW(m_hWnd, WM_WIXSTDBA_APPLY_PACKAGES, 0, 0); + } + + m_fStartedExecution = FALSE; + m_dwCalculatedCacheProgress = 0; + m_dwCalculatedExecuteProgress = 0; + + return hr; + } + + + virtual STDMETHODIMP OnCachePackageBegin( + __in_z LPCWSTR wzPackageId, + __in DWORD cCachePayloads, + __in DWORD64 dw64PackageCacheSize, + __inout BOOL* pfCancel + ) + { + if (wzPackageId && *wzPackageId) + { + BAL_INFO_PACKAGE* pPackage = NULL; + HRESULT hr = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); + LPCWSTR wz = (SUCCEEDED(hr) && pPackage->sczDisplayName) ? pPackage->sczDisplayName : wzPackageId; + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, wz); + + // If something started executing, leave it in the overall progress text. + if (!m_fStartedExecution) + { + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); + } + } + + return __super::OnCachePackageBegin(wzPackageId, cCachePayloads, dw64PackageCacheSize, pfCancel); + } + + + virtual STDMETHODIMP OnCacheAcquireProgress( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in DWORD64 dw64Progress, + __in DWORD64 dw64Total, + __in DWORD dwOverallPercentage, + __inout BOOL* pfCancel + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCacheAcquireProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage); +#endif + + UpdateCacheProgress(dwOverallPercentage); + + return __super::OnCacheAcquireProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnCacheAcquireComplete( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in HRESULT hrStatus, + __in BOOTSTRAPPER_CACHEACQUIRECOMPLETE_ACTION recommendation, + __inout BOOTSTRAPPER_CACHEACQUIRECOMPLETE_ACTION* pAction + ) + { + SetProgressState(hrStatus); + return __super::OnCacheAcquireComplete(wzPackageOrContainerId, wzPayloadId, hrStatus, recommendation, pAction); + } + + + virtual STDMETHODIMP OnCacheVerifyComplete( + __in_z LPCWSTR wzPackageId, + __in_z LPCWSTR wzPayloadId, + __in HRESULT hrStatus, + __in BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION recommendation, + __inout BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION* pAction + ) + { + SetProgressState(hrStatus); + return __super::OnCacheVerifyComplete(wzPackageId, wzPayloadId, hrStatus, recommendation, pAction); + } + + + virtual STDMETHODIMP OnCacheComplete( + __in HRESULT hrStatus + ) + { + UpdateCacheProgress(SUCCEEDED(hrStatus) ? 100 : 0); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, L""); + SetState(WIXSTDBA_STATE_CACHED, S_OK); // we always return success here and let OnApplyComplete() deal with the error. + return __super::OnCacheComplete(hrStatus); + } + + + virtual STDMETHODIMP OnError( + __in BOOTSTRAPPER_ERROR_TYPE errorType, + __in LPCWSTR wzPackageId, + __in DWORD dwCode, + __in_z LPCWSTR wzError, + __in DWORD dwUIHint, + __in DWORD /*cData*/, + __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/, + __in int /*nRecommendation*/, + __inout int* pResult + ) + { + HRESULT hr = S_OK; + int nResult = *pResult; + LPWSTR sczError = NULL; + + if (BOOTSTRAPPER_DISPLAY_EMBEDDED == m_command.display) + { + hr = m_pEngine->SendEmbeddedError(dwCode, wzError, dwUIHint, &nResult); + if (FAILED(hr)) + { + nResult = IDERROR; + } + } + else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display) + { + // If this is an authentication failure, let the engine try to handle it for us. + if (BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_SERVER == errorType || BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_PROXY == errorType) + { + nResult = IDTRYAGAIN; + } + else // show a generic error message box. + { + BalRetryErrorOccurred(wzPackageId, dwCode); + + if (!m_fShowingInternalUiThisPackage) + { + // If no error message was provided, use the error code to try and get an error message. + if (!wzError || !*wzError || BOOTSTRAPPER_ERROR_TYPE_WINDOWS_INSTALLER != errorType) + { + hr = StrAllocFromError(&sczError, dwCode, NULL); + if (FAILED(hr) || !sczError || !*sczError) + { + // special case for ERROR_FAIL_NOACTION_REBOOT: use loc string for Windows XP + if (ERROR_FAIL_NOACTION_REBOOT == dwCode) + { + LOC_STRING* pLocString = NULL; + hr = LocGetString(m_pWixLoc, L"#(loc.ErrorFailNoActionReboot)", &pLocString); + if (SUCCEEDED(hr)) + { + StrAllocString(&sczError, pLocString->wzText, 0); + } + else + { + StrAllocFormatted(&sczError, L"0x%x", dwCode); + } + } + else + { + StrAllocFormatted(&sczError, L"0x%x", dwCode); + } + } + hr = S_OK; + } + + nResult = ::MessageBoxW(m_hWnd, sczError ? sczError : wzError, m_pTheme->sczCaption, dwUIHint); + } + } + + SetProgressState(HRESULT_FROM_WIN32(dwCode)); + } + else // just take note of the error code and let things continue. + { + BalRetryErrorOccurred(wzPackageId, dwCode); + } + + ReleaseStr(sczError); + *pResult = nResult; + return hr; + } + + + virtual STDMETHODIMP OnExecuteMsiMessage( + __in_z LPCWSTR wzPackageId, + __in INSTALLMESSAGE messageType, + __in DWORD dwUIHint, + __in_z LPCWSTR wzMessage, + __in DWORD cData, + __in_ecount_z_opt(cData) LPCWSTR* rgwzData, + __in int nRecommendation, + __inout int* pResult + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnExecuteMsiMessage() - package: %ls, message: %ls", wzPackageId, wzMessage); +#endif + if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display && (INSTALLMESSAGE_WARNING == messageType || INSTALLMESSAGE_USER == messageType)) + { + if (!m_fShowingInternalUiThisPackage) + { + int nResult = ::MessageBoxW(m_hWnd, wzMessage, m_pTheme->sczCaption, dwUIHint); + return nResult; + } + } + + if (INSTALLMESSAGE_ACTIONSTART == messageType) + { + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, wzMessage); + } + + return __super::OnExecuteMsiMessage(wzPackageId, messageType, dwUIHint, wzMessage, cData, rgwzData, nRecommendation, pResult); + } + + + virtual STDMETHODIMP OnProgress( + __in DWORD dwProgressPercentage, + __in DWORD dwOverallProgressPercentage, + __inout BOOL* pfCancel + ) + { + WCHAR wzProgress[5] = { }; + +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnProgress() - progress: %u%%, overall progress: %u%%", dwProgressPercentage, dwOverallProgressPercentage); +#endif + + ::StringCchPrintfW(wzProgress, countof(wzProgress), L"%u%%", dwOverallProgressPercentage); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_TEXT, wzProgress); + + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_BAR, dwOverallProgressPercentage); + SetTaskbarButtonProgress(dwOverallProgressPercentage); + + return __super::OnProgress(dwProgressPercentage, dwOverallProgressPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnExecutePackageBegin( + __in_z LPCWSTR wzPackageId, + __in BOOL fExecute, + __inout BOOL* pfCancel + ) + { + LPWSTR sczFormattedString = NULL; + + m_fStartedExecution = TRUE; + + if (wzPackageId && *wzPackageId) + { + BAL_INFO_PACKAGE* pPackage = NULL; + BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); + + LPCWSTR wz = wzPackageId; + if (pPackage) + { + LOC_STRING* pLocString = NULL; + + switch (pPackage->type) + { + case BAL_INFO_PACKAGE_TYPE_BUNDLE_ADDON: + LocGetString(m_pWixLoc, L"#(loc.ExecuteAddonRelatedBundleMessage)", &pLocString); + break; + + case BAL_INFO_PACKAGE_TYPE_BUNDLE_PATCH: + LocGetString(m_pWixLoc, L"#(loc.ExecutePatchRelatedBundleMessage)", &pLocString); + break; + + case BAL_INFO_PACKAGE_TYPE_BUNDLE_UPGRADE: + LocGetString(m_pWixLoc, L"#(loc.ExecuteUpgradeRelatedBundleMessage)", &pLocString); + break; + } + + if (pLocString) + { + // If the wix developer is showing a hidden variable in the UI, then obviously they don't care about keeping it safe + // so don't go down the rabbit hole of making sure that this is securely freed. + BalFormatString(pLocString->wzText, &sczFormattedString); + } + + wz = sczFormattedString ? sczFormattedString : pPackage->sczDisplayName ? pPackage->sczDisplayName : wzPackageId; + } + + //Burn engine doesn't show internal UI for msi packages during uninstall or repair actions. + m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && BOOTSTRAPPER_ACTION_UNINSTALL != m_plannedAction && BOOTSTRAPPER_ACTION_REPAIR != m_plannedAction; + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); + } + else + { + m_fShowingInternalUiThisPackage = FALSE; + } + + ReleaseStr(sczFormattedString); + return __super::OnExecutePackageBegin(wzPackageId, fExecute, pfCancel); + } + + + virtual STDMETHODIMP OnExecuteProgress( + __in_z LPCWSTR wzPackageId, + __in DWORD dwProgressPercentage, + __in DWORD dwOverallProgressPercentage, + __inout BOOL* pfCancel + ) + { + WCHAR wzProgress[5] = { }; + +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnExecuteProgress() - package: %ls, progress: %u%%, overall progress: %u%%", wzPackageId, dwProgressPercentage, dwOverallProgressPercentage); +#endif + + ::StringCchPrintfW(wzProgress, countof(wzProgress), L"%u%%", dwOverallProgressPercentage); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_TEXT, wzProgress); + + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_BAR, dwOverallProgressPercentage); + + m_dwCalculatedExecuteProgress = dwOverallProgressPercentage * (100 - WIXSTDBA_ACQUIRE_PERCENTAGE) / 100; + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); + + SetTaskbarButtonProgress(m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); + + return __super::OnExecuteProgress(wzPackageId, dwProgressPercentage, dwOverallProgressPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnExecutePackageComplete( + __in_z LPCWSTR wzPackageId, + __in HRESULT hrStatus, + __in BOOTSTRAPPER_APPLY_RESTART restart, + __in BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION recommendation, + __inout BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION* pAction + ) + { + HRESULT hr = S_OK; + SetProgressState(hrStatus); + + hr = __super::OnExecutePackageComplete(wzPackageId, hrStatus, restart, recommendation, pAction); + + WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; + BAL_INFO_PACKAGE* pPackage; + HRESULT hrPrereq = GetPrereqPackage(wzPackageId, &pPrereqPackage, &pPackage); + if (SUCCEEDED(hrPrereq)) + { + pPrereqPackage->fSuccessfullyInstalled = SUCCEEDED(hrStatus); + + // If the prerequisite required a restart (any restart) then do an immediate + // restart to ensure that the bundle will get launched again post reboot. + if (BOOTSTRAPPER_APPLY_RESTART_NONE != restart) + { + *pAction = BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION_RESTART; + } + } + + return hr; + } + + + virtual STDMETHODIMP OnExecuteComplete( + __in HRESULT hrStatus + ) + { + HRESULT hr = S_OK; + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, L""); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, L""); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, L""); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, FALSE); // no more cancel. + + SetState(WIXSTDBA_STATE_EXECUTED, S_OK); // we always return success here and let OnApplyComplete() deal with the error. + SetProgressState(hrStatus); + + return hr; + } + + + virtual STDMETHODIMP OnResolveSource( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in_z LPCWSTR wzLocalSource, + __in_z_opt LPCWSTR wzDownloadSource, + __in BOOTSTRAPPER_RESOLVESOURCE_ACTION /*recommendation*/, + __inout BOOTSTRAPPER_RESOLVESOURCE_ACTION* pAction, + __inout BOOL* pfCancel + ) + { + HRESULT hr = S_OK; + + if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display) + { + if (wzDownloadSource) + { + *pAction = BOOTSTRAPPER_RESOLVESOURCE_ACTION_DOWNLOAD; + } + else // prompt to change the source location. + { + OPENFILENAMEW ofn = { }; + WCHAR wzFile[MAX_PATH] = { }; + + ::StringCchCopyW(wzFile, countof(wzFile), wzLocalSource); + + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = m_hWnd; + ofn.lpstrFile = wzFile; + ofn.nMaxFile = countof(wzFile); + ofn.lpstrFilter = L"All Files\0*.*\0"; + ofn.nFilterIndex = 1; + ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; + ofn.lpstrTitle = m_pTheme->sczCaption; + + if (::GetOpenFileNameW(&ofn)) + { + hr = m_pEngine->SetLocalSource(wzPackageOrContainerId, wzPayloadId, ofn.lpstrFile); + *pAction = BOOTSTRAPPER_RESOLVESOURCE_ACTION_RETRY; + } + else + { + *pfCancel = TRUE; + } + } + } + else if (wzDownloadSource) + { + // If doing a non-interactive install and download source is available, let's try downloading the package silently + *pAction = BOOTSTRAPPER_RESOLVESOURCE_ACTION_DOWNLOAD; + } + // else there's nothing more we can do in non-interactive mode + + *pfCancel |= CheckCanceled(); + return hr; + } + + + virtual STDMETHODIMP OnApplyComplete( + __in HRESULT hrStatus, + __in BOOTSTRAPPER_APPLY_RESTART restart, + __in BOOTSTRAPPER_APPLYCOMPLETE_ACTION recommendation, + __inout BOOTSTRAPPER_APPLYCOMPLETE_ACTION* pAction + ) + { + HRESULT hr = S_OK; + + __super::OnApplyComplete(hrStatus, restart, recommendation, pAction); + + m_restartResult = restart; // remember the restart result so we return the correct error code no matter what the user chooses to do in the UI. + + // If a restart was encountered and we are not suppressing restarts, then restart is required. + m_fRestartRequired = (BOOTSTRAPPER_APPLY_RESTART_NONE != restart && BOOTSTRAPPER_RESTART_NEVER < m_command.restart); + BalSetStringVariable(WIXSTDBA_VARIABLE_RESTART_REQUIRED, m_fRestartRequired ? L"1" : NULL); + + // If a restart is required and we're not displaying a UI or we are not supposed to prompt for restart then allow the restart. + m_fAllowRestart = m_fRestartRequired && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_RESTART_PROMPT < m_command.restart); + + if (m_fPrereq) + { + m_fPrereqInstalled = TRUE; + BOOL fInstalledAPackage = FALSE; + + for (DWORD i = 0; i < m_cPrereqPackages; ++i) + { + if (m_rgPrereqPackages[i].sczPackageId && m_rgPrereqPackages[i].fPlannedToBeInstalled && !m_rgPrereqPackages[i].fWasAlreadyInstalled) + { + if (m_rgPrereqPackages[i].fSuccessfullyInstalled) + { + fInstalledAPackage = TRUE; + } + else + { + m_fPrereqInstalled = FALSE; + break; + } + } + } + + m_fPrereqInstalled = m_fPrereqInstalled && fInstalledAPackage; + } + + // If we are showing UI, wait a beat before moving to the final screen. + if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) + { + ::Sleep(250); + } + + SetState(WIXSTDBA_STATE_APPLIED, hrStatus); + SetTaskbarButtonProgress(100); // show full progress bar, green, yellow, or red + + *pAction = BOOTSTRAPPER_APPLYCOMPLETE_ACTION_NONE; + + return hr; + } + + virtual STDMETHODIMP OnLaunchApprovedExeComplete( + __in HRESULT hrStatus, + __in DWORD /*processId*/ + ) + { + HRESULT hr = S_OK; + + if (HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) == hrStatus) + { + //try with ShelExec next time + OnClickLaunchButton(); + } + else + { + ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); + } + + return hr; + } + + virtual STDMETHODIMP_(void) BAProcFallback( + __in BOOTSTRAPPER_APPLICATION_MESSAGE message, + __in const LPVOID pvArgs, + __inout LPVOID pvResults, + __inout HRESULT* phr, + __in_opt LPVOID /*pvContext*/ + ) + { + if (!m_pfnBAFunctionsProc || FAILED(*phr)) + { + return; + } + + // Always log before and after so we don't get blamed when BAFunctions changes something. + switch (message) + { + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTBEGIN: + OnDetectBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPLETE: + OnDetectCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANBEGIN: + OnPlanBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPLETE: + OnPlanCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP: // BAFunctions is loaded during this event on a separate thread so it's not possible to forward it. + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN: + OnShutdownFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMSHUTDOWN: + OnSystemShutdownFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE: + OnDetectForwardCompatibleBundleFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATEBEGIN: + OnDetectUpdateBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATE: + OnDetectUpdateFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATECOMPLETE: + OnDetectUpdateCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE: + OnDetectRelatedBundleFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN: + OnDetectPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE: + OnDetectCompatibleMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE: + OnDetectRelatedMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE: + OnDetectTargetMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE: + OnDetectMsiFeatureFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE: + OnDetectPackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE: + OnPlanRelatedBundleFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN: + OnPlanPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN: + OnPlanCompatibleMsiPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE: + OnPlanCompatibleMsiPackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE: + OnPlanTargetMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE: + OnPlanMsiFeatureFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGECOMPLETE: + OnPlanPackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYBEGIN: + OnApplyBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONELEVATEBEGIN: + OnElevateBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONELEVATECOMPLETE: + OnElevateCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPROGRESS: + OnProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONERROR: + OnErrorFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONREGISTERBEGIN: + OnRegisterBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONREGISTERCOMPLETE: + OnRegisterCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEBEGIN: + OnCacheBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGEBEGIN: + OnCachePackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIREBEGIN: + OnCacheAcquireBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIREPROGRESS: + OnCacheAcquireProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONRESOLVESOURCE: + OnResolveSourceFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIRECOMPLETE: + OnCacheAcquireCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEVERIFYBEGIN: + OnCacheVerifyBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEVERIFYCOMPLETE: + OnCacheVerifyCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGECOMPLETE: + OnCachePackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECOMPLETE: + OnCacheCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEBEGIN: + OnExecuteBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPACKAGEBEGIN: + OnExecutePackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPATCHTARGET: + OnExecutePatchTargetFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPROGRESS: + OnExecuteProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEMSIMESSAGE: + OnExecuteMsiMessageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEFILESINUSE: + OnExecuteFilesInUseFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPACKAGECOMPLETE: + OnExecutePackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTECOMPLETE: + OnExecuteCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONUNREGISTERBEGIN: + OnUnregisterBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONUNREGISTERCOMPLETE: + OnUnregisterCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYCOMPLETE: + OnApplyCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONLAUNCHAPPROVEDEXEBEGIN: + OnLaunchApprovedExeBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONLAUNCHAPPROVEDEXECOMPLETE: + OnLaunchApprovedExeCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + default: + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message); + m_pfnBAFunctionsProc((BA_FUNCTIONS_MESSAGE)message, pvArgs, pvResults, m_pvBAFunctionsProcContext); + break; + } + } + + +private: // privates + void OnDetectBeginFallback( + __in BA_ONDETECTBEGIN_ARGS* pArgs, + __inout BA_ONDETECTBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectCompleteFallback( + __in BA_ONDETECTCOMPLETE_ARGS* pArgs, + __inout BA_ONDETECTCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlanBeginFallback( + __in BA_ONPLANBEGIN_ARGS* pArgs, + __inout BA_ONPLANBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlanCompleteFallback( + __in BA_ONPLANCOMPLETE_ARGS* pArgs, + __inout BA_ONPLANCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnShutdownFallback( + __in BA_ONSHUTDOWN_ARGS* pArgs, + __inout BA_ONSHUTDOWN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnSystemShutdownFallback( + __in BA_ONSYSTEMSHUTDOWN_ARGS* pArgs, + __inout BA_ONSYSTEMSHUTDOWN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectForwardCompatibleBundleFallback( + __in BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs, + __inout BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults + ) + { + BOOL fIgnoreBundle = pResults->fIgnoreBundle; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_DETECTED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleId, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable"); + } + + void OnDetectUpdateBeginFallback( + __in BA_ONDETECTUPDATEBEGIN_ARGS* pArgs, + __inout BA_ONDETECTUPDATEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTUPDATEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectUpdateFallback( + __in BA_ONDETECTUPDATE_ARGS* pArgs, + __inout BA_ONDETECTUPDATE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTUPDATE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectUpdateCompleteFallback( + __in BA_ONDETECTUPDATECOMPLETE_ARGS* pArgs, + __inout BA_ONDETECTUPDATECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTUPDATECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectRelatedBundleFallback( + __in BA_ONDETECTRELATEDBUNDLE_ARGS* pArgs, + __inout BA_ONDETECTRELATEDBUNDLE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectPackageBeginFallback( + __in BA_ONDETECTPACKAGEBEGIN_ARGS* pArgs, + __inout BA_ONDETECTPACKAGEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectCompatibleMsiPackageFallback( + __in BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS* pArgs, + __inout BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectRelatedMsiPackageFallback( + __in BA_ONDETECTRELATEDMSIPACKAGE_ARGS* pArgs, + __inout BA_ONDETECTRELATEDMSIPACKAGE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectTargetMsiPackageFallback( + __in BA_ONDETECTTARGETMSIPACKAGE_ARGS* pArgs, + __inout BA_ONDETECTTARGETMSIPACKAGE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTTARGETMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectMsiFeatureFallback( + __in BA_ONDETECTMSIFEATURE_ARGS* pArgs, + __inout BA_ONDETECTMSIFEATURE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTMSIFEATURE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectPackageCompleteFallback( + __in BA_ONDETECTPACKAGECOMPLETE_ARGS* pArgs, + __inout BA_ONDETECTPACKAGECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlanRelatedBundleFallback( + __in BA_ONPLANRELATEDBUNDLE_ARGS* pArgs, + __inout BA_ONPLANRELATEDBUNDLE_RESULTS* pResults + ) + { + BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE, m_hModule, pArgs->wzBundleId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); + } + + void OnPlanPackageBeginFallback( + __in BA_ONPLANPACKAGEBEGIN_ARGS* pArgs, + __inout BA_ONPLANPACKAGEBEGIN_RESULTS* pResults + ) + { + BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_PACKAGE, m_hModule, pArgs->wzPackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); + } + + void OnPlanCompatibleMsiPackageBeginFallback( + __in BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS* pArgs, + __inout BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS* pResults + ) + { + BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_COMPATIBLE_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, pArgs->wzCompatiblePackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); + } + + void OnPlanCompatibleMsiPackageCompleteFallback( + __in BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS* pArgs, + __inout BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlanTargetMsiPackageFallback( + __in BA_ONPLANTARGETMSIPACKAGE_ARGS* pArgs, + __inout BA_ONPLANTARGETMSIPACKAGE_RESULTS* pResults + ) + { + BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANTARGETMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, pArgs->wzProductCode, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); + } + + void OnPlanMsiFeatureFallback( + __in BA_ONPLANMSIFEATURE_ARGS* pArgs, + __inout BA_ONPLANMSIFEATURE_RESULTS* pResults + ) + { + BOOTSTRAPPER_FEATURE_STATE requestedState = pResults->requestedState; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANMSIFEATURE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_MSI_FEATURE, m_hModule, pArgs->wzPackageId, pArgs->wzFeatureId, LoggingMsiFeatureStateToString(requestedState), LoggingMsiFeatureStateToString(pResults->requestedState)); + } + + void OnPlanPackageCompleteFallback( + __in BA_ONPLANPACKAGECOMPLETE_ARGS* pArgs, + __inout BA_ONPLANPACKAGECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnApplyBeginFallback( + __in BA_ONAPPLYBEGIN_ARGS* pArgs, + __inout BA_ONAPPLYBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONAPPLYBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnElevateBeginFallback( + __in BA_ONELEVATEBEGIN_ARGS* pArgs, + __inout BA_ONELEVATEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONELEVATEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnElevateCompleteFallback( + __in BA_ONELEVATECOMPLETE_ARGS* pArgs, + __inout BA_ONELEVATECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONELEVATECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnProgressFallback( + __in BA_ONPROGRESS_ARGS* pArgs, + __inout BA_ONPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnErrorFallback( + __in BA_ONERROR_ARGS* pArgs, + __inout BA_ONERROR_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONERROR, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnRegisterBeginFallback( + __in BA_ONREGISTERBEGIN_ARGS* pArgs, + __inout BA_ONREGISTERBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONREGISTERBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnRegisterCompleteFallback( + __in BA_ONREGISTERCOMPLETE_ARGS* pArgs, + __inout BA_ONREGISTERCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONREGISTERCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheBeginFallback( + __in BA_ONCACHEBEGIN_ARGS* pArgs, + __inout BA_ONCACHEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePackageBeginFallback( + __in BA_ONCACHEPACKAGEBEGIN_ARGS* pArgs, + __inout BA_ONCACHEPACKAGEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheAcquireBeginFallback( + __in BA_ONCACHEACQUIREBEGIN_ARGS* pArgs, + __inout BA_ONCACHEACQUIREBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIREBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheAcquireProgressFallback( + __in BA_ONCACHEACQUIREPROGRESS_ARGS* pArgs, + __inout BA_ONCACHEACQUIREPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIREPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnResolveSourceFallback( + __in BA_ONRESOLVESOURCE_ARGS* pArgs, + __inout BA_ONRESOLVESOURCE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONRESOLVESOURCE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheAcquireCompleteFallback( + __in BA_ONCACHEACQUIRECOMPLETE_ARGS* pArgs, + __inout BA_ONCACHEACQUIRECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIRECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheVerifyBeginFallback( + __in BA_ONCACHEVERIFYBEGIN_ARGS* pArgs, + __inout BA_ONCACHEVERIFYBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEVERIFYBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheVerifyCompleteFallback( + __in BA_ONCACHEVERIFYCOMPLETE_ARGS* pArgs, + __inout BA_ONCACHEVERIFYCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEVERIFYCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePackageCompleteFallback( + __in BA_ONCACHEPACKAGECOMPLETE_ARGS* pArgs, + __inout BA_ONCACHEPACKAGECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheCompleteFallback( + __in BA_ONCACHECOMPLETE_ARGS* pArgs, + __inout BA_ONCACHECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteBeginFallback( + __in BA_ONEXECUTEBEGIN_ARGS* pArgs, + __inout BA_ONEXECUTEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecutePackageBeginFallback( + __in BA_ONEXECUTEPACKAGEBEGIN_ARGS* pArgs, + __inout BA_ONEXECUTEPACKAGEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecutePatchTargetFallback( + __in BA_ONEXECUTEPATCHTARGET_ARGS* pArgs, + __inout BA_ONEXECUTEPATCHTARGET_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteProgressFallback( + __in BA_ONEXECUTEPROGRESS_ARGS* pArgs, + __inout BA_ONEXECUTEPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteMsiMessageFallback( + __in BA_ONEXECUTEMSIMESSAGE_ARGS* pArgs, + __inout BA_ONEXECUTEMSIMESSAGE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEMSIMESSAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteFilesInUseFallback( + __in BA_ONEXECUTEFILESINUSE_ARGS* pArgs, + __inout BA_ONEXECUTEFILESINUSE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEFILESINUSE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecutePackageCompleteFallback( + __in BA_ONEXECUTEPACKAGECOMPLETE_ARGS* pArgs, + __inout BA_ONEXECUTEPACKAGECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteCompleteFallback( + __in BA_ONEXECUTECOMPLETE_ARGS* pArgs, + __inout BA_ONEXECUTECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnUnregisterBeginFallback( + __in BA_ONUNREGISTERBEGIN_ARGS* pArgs, + __inout BA_ONUNREGISTERBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONUNREGISTERBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnUnregisterCompleteFallback( + __in BA_ONUNREGISTERCOMPLETE_ARGS* pArgs, + __inout BA_ONUNREGISTERCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONUNREGISTERCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnApplyCompleteFallback( + __in BA_ONAPPLYCOMPLETE_ARGS* pArgs, + __inout BA_ONAPPLYCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONAPPLYCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnLaunchApprovedExeBeginFallback( + __in BA_ONLAUNCHAPPROVEDEXEBEGIN_ARGS* pArgs, + __inout BA_ONLAUNCHAPPROVEDEXEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONLAUNCHAPPROVEDEXEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnLaunchApprovedExeCompleteFallback( + __in BA_ONLAUNCHAPPROVEDEXECOMPLETE_ARGS* pArgs, + __inout BA_ONLAUNCHAPPROVEDEXECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONLAUNCHAPPROVEDEXECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + // + // UiThreadProc - entrypoint for UI thread. + // + static DWORD WINAPI UiThreadProc( + __in LPVOID pvContext + ) + { + HRESULT hr = S_OK; + CWixStandardBootstrapperApplication* pThis = (CWixStandardBootstrapperApplication*)pvContext; + BOOL fComInitialized = FALSE; + BOOL fRet = FALSE; + MSG msg = { }; + + // Initialize COM and theme. + hr = ::CoInitialize(NULL); + BalExitOnFailure(hr, "Failed to initialize COM."); + fComInitialized = TRUE; + + hr = ThemeInitialize(pThis->m_hModule); + BalExitOnFailure(hr, "Failed to initialize theme manager."); + + hr = pThis->InitializeData(); + BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application."); + + // Create main window. + pThis->InitializeTaskbarButton(); + hr = pThis->CreateMainWindow(); + BalExitOnFailure(hr, "Failed to create main window."); + + if (FAILED(pThis->m_hrFinal)) + { + pThis->SetState(WIXSTDBA_STATE_FAILED, hr); + ::PostMessageW(pThis->m_hWnd, WM_WIXSTDBA_SHOW_FAILURE, 0, 0); + } + else + { + // Okay, we're ready for packages now. + pThis->SetState(WIXSTDBA_STATE_INITIALIZED, hr); + ::PostMessageW(pThis->m_hWnd, BOOTSTRAPPER_ACTION_HELP == pThis->m_command.action ? WM_WIXSTDBA_SHOW_HELP : WM_WIXSTDBA_DETECT_PACKAGES, 0, 0); + } + + // message pump + while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0))) + { + if (-1 == fRet) + { + hr = E_UNEXPECTED; + BalExitOnFailure(hr, "Unexpected return value from message pump."); + } + else if (!ThemeHandleKeyboardMessage(pThis->m_pTheme, msg.hwnd, &msg)) + { + ::TranslateMessage(&msg); + ::DispatchMessageW(&msg); + } + } + + // Succeeded thus far, check to see if anything went wrong while actually + // executing changes. + if (FAILED(pThis->m_hrFinal)) + { + hr = pThis->m_hrFinal; + } + else if (pThis->CheckCanceled()) + { + hr = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT); + } + + LExit: + // destroy main window + pThis->DestroyMainWindow(); + + // initiate engine shutdown + DWORD dwQuit = HRESULT_CODE(hr); + if (BOOTSTRAPPER_APPLY_RESTART_INITIATED == pThis->m_restartResult) + { + dwQuit = ERROR_SUCCESS_REBOOT_INITIATED; + } + else if (BOOTSTRAPPER_APPLY_RESTART_REQUIRED == pThis->m_restartResult) + { + dwQuit = ERROR_SUCCESS_REBOOT_REQUIRED; + } + pThis->m_pEngine->Quit(dwQuit); + + ReleaseTheme(pThis->m_pTheme); + ThemeUninitialize(); + + // uninitialize COM + if (fComInitialized) + { + ::CoUninitialize(); + } + + return hr; + } + + + // + // InitializeData - initializes all the package and prerequisite information. + // + HRESULT InitializeData() + { + HRESULT hr = S_OK; + LPWSTR sczModulePath = NULL; + IXMLDOMDocument *pixdManifest = NULL; + + hr = BalManifestLoad(m_hModule, &pixdManifest); + BalExitOnFailure(hr, "Failed to load bootstrapper application manifest."); + + hr = ParseOverridableVariablesFromXml(pixdManifest); + BalExitOnFailure(hr, "Failed to read overridable variables."); + + hr = ProcessCommandLine(&m_sczLanguage); + ExitOnFailure(hr, "Unknown commandline parameters."); + + hr = PathRelativeToModule(&sczModulePath, NULL, m_hModule); + BalExitOnFailure(hr, "Failed to get module path."); + + hr = LoadLocalization(sczModulePath, m_sczLanguage); + ExitOnFailure(hr, "Failed to load localization."); + + hr = LoadTheme(sczModulePath, m_sczLanguage); + ExitOnFailure(hr, "Failed to load theme."); + + hr = BalInfoParseFromXml(&m_Bundle, pixdManifest); + BalExitOnFailure(hr, "Failed to load bundle information."); + + hr = BalConditionsParseFromXml(&m_Conditions, pixdManifest, m_pWixLoc); + BalExitOnFailure(hr, "Failed to load conditions from XML."); + + hr = LoadBAFunctions(pixdManifest); + BalExitOnFailure(hr, "Failed to load bootstrapper functions."); + + GetBundleFileVersion(); + // don't fail if we couldn't get the version info; best-effort only + + if (m_fPrereq) + { + hr = ParsePrerequisiteInformationFromXml(pixdManifest); + BalExitOnFailure(hr, "Failed to read prerequisite information."); + } + else + { + hr = ParseBootstrapperApplicationDataFromXml(pixdManifest); + BalExitOnFailure(hr, "Failed to read bootstrapper application data."); + } + + LExit: + ReleaseObject(pixdManifest); + ReleaseStr(sczModulePath); + + return hr; + } + + + // + // ProcessCommandLine - process the provided command line arguments. + // + HRESULT ProcessCommandLine( + __inout LPWSTR* psczLanguage + ) + { + HRESULT hr = S_OK; + int argc = 0; + LPWSTR* argv = NULL; + LPWSTR sczVariableName = NULL; + LPWSTR sczVariableValue = NULL; + + if (m_command.wzCommandLine && *m_command.wzCommandLine) + { + hr = AppParseCommandLine(m_command.wzCommandLine, &argc, &argv); + ExitOnFailure(hr, "Failed to parse command line."); + + for (int i = 0; i < argc; ++i) + { + if (argv[i][0] == L'-' || argv[i][0] == L'/') + { + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"lang", -1)) + { + if (i + 1 >= argc) + { + hr = E_INVALIDARG; + BalExitOnFailure(hr, "Must specify a language."); + } + + ++i; + + hr = StrAllocString(psczLanguage, &argv[i][0], 0); + BalExitOnFailure(hr, "Failed to copy language."); + } + } + else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"cache", -1)) + { + m_plannedAction = BOOTSTRAPPER_ACTION_CACHE; + } + else if (m_sdOverridableVariables) + { + const wchar_t* pwc = wcschr(argv[i], L'='); + if (pwc) + { + hr = StrAllocString(&sczVariableName, argv[i], pwc - argv[i]); + BalExitOnFailure(hr, "Failed to copy variable name."); + + hr = DictKeyExists(m_sdOverridableVariables, sczVariableName); + if (E_NOTFOUND == hr) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Ignoring attempt to set non-overridable variable: '%ls'.", sczVariableName); + hr = S_OK; + continue; + } + ExitOnFailure(hr, "Failed to check the dictionary of overridable variables."); + + hr = StrAllocString(&sczVariableValue, ++pwc, 0); + BalExitOnFailure(hr, "Failed to copy variable value."); + + hr = m_pEngine->SetVariableString(sczVariableName, sczVariableValue); + BalExitOnFailure(hr, "Failed to set variable."); + } + else + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Ignoring unknown argument: %ls", argv[i]); + } + } + } + } + + LExit: + if (argv) + { + AppFreeCommandLineArgs(argv); + } + + ReleaseStr(sczVariableName); + ReleaseStr(sczVariableValue); + + return hr; + } + + HRESULT LoadLocalization( + __in_z LPCWSTR wzModulePath, + __in_z_opt LPCWSTR wzLanguage + ) + { + HRESULT hr = S_OK; + LPWSTR sczLocPath = NULL; + LPWSTR sczFormatted = NULL; + LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl"; + + // Find and load .wxl file. + hr = LocProbeForFile(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath); + BalExitOnFailure(hr, "Failed to probe for loc file: %ls in path: %ls", wzLocFileName, wzModulePath); + + hr = LocLoadFromFile(sczLocPath, &m_pWixLoc); + BalExitOnFailure(hr, "Failed to load loc file from path: %ls", sczLocPath); + + // Set WixStdBALanguageId to .wxl language id. + if (WIX_LOCALIZATION_LANGUAGE_NOT_SET != m_pWixLoc->dwLangId) + { + ::SetThreadLocale(m_pWixLoc->dwLangId); + + hr = m_pEngine->SetVariableNumeric(WIXSTDBA_VARIABLE_LANGUAGE_ID, m_pWixLoc->dwLangId); + BalExitOnFailure(hr, "Failed to set WixStdBALanguageId variable."); + } + + // Load ConfirmCancelMessage. + hr = StrAllocString(&m_sczConfirmCloseMessage, L"#(loc.ConfirmCancelMessage)", 0); + ExitOnFailure(hr, "Failed to initialize confirm message loc identifier."); + + hr = LocLocalizeString(m_pWixLoc, &m_sczConfirmCloseMessage); + BalExitOnFailure(hr, "Failed to localize confirm close message: %ls", m_sczConfirmCloseMessage); + + hr = BalFormatString(m_sczConfirmCloseMessage, &sczFormatted); + if (SUCCEEDED(hr)) + { + ReleaseStr(m_sczConfirmCloseMessage); + m_sczConfirmCloseMessage = sczFormatted; + sczFormatted = NULL; + } + + LExit: + ReleaseStr(sczFormatted); + ReleaseStr(sczLocPath); + + return hr; + } + + + HRESULT LoadTheme( + __in_z LPCWSTR wzModulePath, + __in_z_opt LPCWSTR wzLanguage + ) + { + HRESULT hr = S_OK; + LPWSTR sczThemePath = NULL; + LPCWSTR wzThemeFileName = m_fPrereq ? L"mbapreq.thm" : L"thm.xml"; + + hr = LocProbeForFile(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath); + BalExitOnFailure(hr, "Failed to probe for theme file: %ls in path: %ls", wzThemeFileName, wzModulePath); + + hr = ThemeLoadFromFile(sczThemePath, &m_pTheme); + BalExitOnFailure(hr, "Failed to load theme from path: %ls", sczThemePath); + + hr = ThemeRegisterVariableCallbacks(m_pTheme, EvaluateVariableConditionCallback, FormatVariableStringCallback, GetVariableNumericCallback, SetVariableNumericCallback, GetVariableStringCallback, SetVariableStringCallback, NULL); + BalExitOnFailure(hr, "Failed to register variable theme callbacks."); + + hr = ThemeLocalize(m_pTheme, m_pWixLoc); + BalExitOnFailure(hr, "Failed to localize theme: %ls", sczThemePath); + + LExit: + ReleaseStr(sczThemePath); + + return hr; + } + + + HRESULT ParseOverridableVariablesFromXml( + __in IXMLDOMDocument* pixdManifest + ) + { + HRESULT hr = S_OK; + IXMLDOMNode* pNode = NULL; + IXMLDOMNodeList* pNodes = NULL; + DWORD cNodes = 0; + LPWSTR scz = NULL; + + // Get the list of variables users can override on the command line. + hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixStdbaOverridableVariable", &pNodes); + if (S_FALSE == hr) + { + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to select overridable variable nodes."); + + hr = pNodes->get_length((long*)&cNodes); + ExitOnFailure(hr, "Failed to get overridable variable node count."); + + if (cNodes) + { + hr = DictCreateStringList(&m_sdOverridableVariables, 32, DICT_FLAG_NONE); + ExitOnFailure(hr, "Failed to create the string dictionary."); + + for (DWORD i = 0; i < cNodes; ++i) + { + hr = XmlNextElement(pNodes, &pNode, NULL); + ExitOnFailure(hr, "Failed to get next node."); + + // @Name + hr = XmlGetAttributeEx(pNode, L"Name", &scz); + ExitOnFailure(hr, "Failed to get @Name."); + + hr = DictAddKey(m_sdOverridableVariables, scz); + ExitOnFailure(hr, "Failed to add \"%ls\" to the string dictionary.", scz); + + // prepare next iteration + ReleaseNullObject(pNode); + } + } + + LExit: + ReleaseObject(pNode); + ReleaseObject(pNodes); + ReleaseStr(scz); + return hr; + } + + + HRESULT ParsePrerequisiteInformationFromXml( + __in IXMLDOMDocument* pixdManifest + ) + { + HRESULT hr = S_OK; + IXMLDOMNode* pNode = NULL; + IXMLDOMNodeList* pNodes = NULL; + DWORD cNodes = 0; + LPWSTR scz = NULL; + WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; + BAL_INFO_PACKAGE* pPackage = NULL; + + hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixMbaPrereqInformation", &pNodes); + if (S_FALSE == hr) + { + hr = E_INVALIDARG; + BalExitOnFailure(hr, "BootstrapperApplication.xml manifest is missing prerequisite information."); + } + BalExitOnFailure(hr, "Failed to select prerequisite information nodes."); + + hr = pNodes->get_length((long*)&cNodes); + BalExitOnFailure(hr, "Failed to get prerequisite information node count."); + + m_cPrereqPackages = cNodes; + m_rgPrereqPackages = static_cast(MemAlloc(sizeof(WIXSTDBA_PREREQ_PACKAGE) * m_cPrereqPackages, TRUE)); + + hr = DictCreateWithEmbeddedKey(&m_shPrereqSupportPackages, m_cPrereqPackages, reinterpret_cast(&m_rgPrereqPackages), offsetof(WIXSTDBA_PREREQ_PACKAGE, sczPackageId), DICT_FLAG_NONE); + BalExitOnFailure(hr, "Failed to create the prerequisite package dictionary."); + + for (DWORD i = 0; i < cNodes; ++i) + { + hr = XmlNextElement(pNodes, &pNode, NULL); + BalExitOnFailure(hr, "Failed to get next node."); + + hr = XmlGetAttributeEx(pNode, L"PackageId", &scz); + BalExitOnFailure(hr, "Failed to get @PackageId."); + + hr = DictGetValue(m_shPrereqSupportPackages, scz, reinterpret_cast(&pPrereqPackage)); + if (SUCCEEDED(hr)) + { + hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); + BalExitOnFailure(hr, "Duplicate prerequisite information: %ls", scz); + } + else if (E_NOTFOUND != hr) + { + BalExitOnFailure(hr, "Failed to check if \"%ls\" was in the prerequisite package dictionary.", scz); + } + + hr = BalInfoFindPackageById(&m_Bundle.packages, scz, &pPackage); + BalExitOnFailure(hr, "Failed to get info about \"%ls\" from BootstrapperApplicationData.", scz); + + pPrereqPackage = &m_rgPrereqPackages[i]; + pPrereqPackage->sczPackageId = pPackage->sczId; + hr = DictAddValue(m_shPrereqSupportPackages, pPrereqPackage); + BalExitOnFailure(hr, "Failed to add \"%ls\" to the prerequisite package dictionary.", pPrereqPackage->sczPackageId); + + hr = XmlGetAttributeEx(pNode, L"LicenseFile", &scz); + if (E_NOTFOUND != hr) + { + BalExitOnFailure(hr, "Failed to get @LicenseFile."); + + if (m_sczLicenseFile) + { + hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); + BalExitOnFailure(hr, "More than one license file specified in prerequisite info."); + } + + m_sczLicenseFile = scz; + scz = NULL; + } + + hr = XmlGetAttributeEx(pNode, L"LicenseUrl", &scz); + if (E_NOTFOUND != hr) + { + BalExitOnFailure(hr, "Failed to get @LicenseUrl."); + + if (m_sczLicenseUrl) + { + hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); + BalExitOnFailure(hr, "More than one license URL specified in prerequisite info."); + } + + m_sczLicenseUrl = scz; + scz = NULL; + } + + // Prepare next iteration. + ReleaseNullObject(pNode); + } + + LExit: + ReleaseObject(pNode); + ReleaseObject(pNodes); + ReleaseStr(scz); + return hr; + } + + + HRESULT ParseBootstrapperApplicationDataFromXml( + __in IXMLDOMDocument* pixdManifest + ) + { + HRESULT hr = S_OK; + IXMLDOMNode* pNode = NULL; + DWORD dwBool = 0; + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixStdbaInformation", &pNode); + if (S_FALSE == hr) + { + hr = E_INVALIDARG; + } + BalExitOnFailure(hr, "BootstrapperApplication.xml manifest is missing wixstdba information."); + + hr = XmlGetAttributeEx(pNode, L"LicenseFile", &m_sczLicenseFile); + if (E_NOTFOUND == hr) + { + hr = S_OK; + } + BalExitOnFailure(hr, "Failed to get license file."); + + hr = XmlGetAttributeEx(pNode, L"LicenseUrl", &m_sczLicenseUrl); + if (E_NOTFOUND == hr) + { + hr = S_OK; + } + BalExitOnFailure(hr, "Failed to get license URL."); + + ReleaseObject(pNode); + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixStdbaOptions", &pNode); + if (S_FALSE == hr) + { + ExitFunction1(hr = S_OK); + } + BalExitOnFailure(hr, "Failed to read wixstdba options from BootstrapperApplication.xml manifest."); + + hr = XmlGetAttributeNumber(pNode, L"SuppressOptionsUI", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr) && dwBool) + { + hr = BalSetNumericVariable(WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI, 1); + BalExitOnFailure(hr, "Failed to set '%ls' variable.", WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI); + } + BalExitOnFailure(hr, "Failed to get SuppressOptionsUI value."); + + dwBool = 0; + hr = XmlGetAttributeNumber(pNode, L"SuppressDowngradeFailure", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr)) + { + m_fSuppressDowngradeFailure = 0 < dwBool; + } + BalExitOnFailure(hr, "Failed to get SuppressDowngradeFailure value."); + + dwBool = 0; + hr = XmlGetAttributeNumber(pNode, L"SuppressRepair", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr)) + { + m_fSuppressRepair = 0 < dwBool; + } + BalExitOnFailure(hr, "Failed to get SuppressRepair value."); + + hr = XmlGetAttributeNumber(pNode, L"ShowVersion", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr) && dwBool) + { + hr = BalSetNumericVariable(WIXSTDBA_VARIABLE_SHOW_VERSION, 1); + BalExitOnFailure(hr, "Failed to set '%ls' variable.", WIXSTDBA_VARIABLE_SHOW_VERSION); + } + BalExitOnFailure(hr, "Failed to get ShowVersion value."); + + hr = XmlGetAttributeNumber(pNode, L"SupportCacheOnly", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr)) + { + m_fSupportCacheOnly = 0 < dwBool; + } + BalExitOnFailure(hr, "Failed to get SupportCacheOnly value."); + + LExit: + ReleaseObject(pNode); + return hr; + } + + HRESULT GetPrereqPackage( + __in_z LPCWSTR wzPackageId, + __out WIXSTDBA_PREREQ_PACKAGE** ppPrereqPackage, + __out BAL_INFO_PACKAGE** ppPackage + ) + { + HRESULT hr = E_NOTFOUND; + WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; + BAL_INFO_PACKAGE* pPackage = NULL; + + Assert(wzPackageId && *wzPackageId); + Assert(ppPackage); + Assert(ppPrereqPackage); + + if (m_shPrereqSupportPackages) + { + hr = DictGetValue(m_shPrereqSupportPackages, wzPackageId, reinterpret_cast(&pPrereqPackage)); + if (E_NOTFOUND != hr) + { + ExitOnFailure(hr, "Failed to check the dictionary of prerequisite packages."); + + // Ignore error. + BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); + } + } + + if (pPrereqPackage) + { + *ppPrereqPackage = pPrereqPackage; + *ppPackage = pPackage; + } + LExit: + return hr; + } + + + // + // Get the file version of the bootstrapper and record in bootstrapper log file + // + HRESULT GetBundleFileVersion() + { + HRESULT hr = S_OK; + ULARGE_INTEGER uliVersion = { }; + LPWSTR sczCurrentPath = NULL; + + hr = PathForCurrentProcess(&sczCurrentPath, NULL); + BalExitOnFailure(hr, "Failed to get bundle path."); + + hr = FileVersion(sczCurrentPath, &uliVersion.HighPart, &uliVersion.LowPart); + BalExitOnFailure(hr, "Failed to get bundle file version."); + + hr = m_pEngine->SetVariableVersion(WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION, uliVersion.QuadPart); + BalExitOnFailure(hr, "Failed to set WixBundleFileVersion variable."); + + LExit: + ReleaseStr(sczCurrentPath); + + return hr; + } + + + // + // CreateMainWindow - creates the main install window. + // + HRESULT CreateMainWindow() + { + HRESULT hr = S_OK; + HICON hIcon = reinterpret_cast(m_pTheme->hIcon); + WNDCLASSW wc = { }; + DWORD dwWindowStyle = 0; + int x = CW_USEDEFAULT; + int y = CW_USEDEFAULT; + POINT ptCursor = { }; + HMONITOR hMonitor = NULL; + MONITORINFO mi = { }; + + // If the theme did not provide an icon, try using the icon from the bundle engine. + if (!hIcon) + { + HMODULE hBootstrapperEngine = ::GetModuleHandleW(NULL); + if (hBootstrapperEngine) + { + hIcon = ::LoadIconW(hBootstrapperEngine, MAKEINTRESOURCEW(1)); + } + } + + // Register the window class and create the window. + wc.lpfnWndProc = CWixStandardBootstrapperApplication::WndProc; + wc.hInstance = m_hModule; + wc.hIcon = hIcon; + wc.hCursor = ::LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + wc.hbrBackground = m_pTheme->rgFonts[m_pTheme->dwFontId].hBackground; + wc.lpszMenuName = NULL; + wc.lpszClassName = WIXSTDBA_WINDOW_CLASS; + if (!::RegisterClassW(&wc)) + { + ExitWithLastError(hr, "Failed to register window."); + } + + m_fRegistered = TRUE; + + // Calculate the window style based on the theme style and command display value. + dwWindowStyle = m_pTheme->dwStyle; + if (BOOTSTRAPPER_DISPLAY_NONE >= m_command.display) + { + dwWindowStyle &= ~WS_VISIBLE; + } + + // Don't show the window if there is a splash screen (it will be made visible when the splash screen is hidden) + if (::IsWindow(m_command.hwndSplashScreen)) + { + dwWindowStyle &= ~WS_VISIBLE; + } + + // Center the window on the monitor with the mouse. + if (::GetCursorPos(&ptCursor)) + { + hMonitor = ::MonitorFromPoint(ptCursor, MONITOR_DEFAULTTONEAREST); + if (hMonitor) + { + mi.cbSize = sizeof(mi); + if (::GetMonitorInfoW(hMonitor, &mi)) + { + x = mi.rcWork.left + (mi.rcWork.right - mi.rcWork.left - m_pTheme->nWidth) / 2; + y = mi.rcWork.top + (mi.rcWork.bottom - mi.rcWork.top - m_pTheme->nHeight) / 2; + } + } + } + + m_hWnd = ::CreateWindowExW(0, wc.lpszClassName, m_pTheme->sczCaption, dwWindowStyle, x, y, m_pTheme->nWidth, m_pTheme->nHeight, HWND_DESKTOP, NULL, m_hModule, this); + ExitOnNullWithLastError(m_hWnd, hr, "Failed to create window."); + + hr = S_OK; + + LExit: + return hr; + } + + + // + // InitializeTaskbarButton - initializes taskbar button for progress. + // + void InitializeTaskbarButton() + { + HRESULT hr = S_OK; + + hr = ::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, __uuidof(ITaskbarList3), reinterpret_cast(&m_pTaskbarList)); + if (REGDB_E_CLASSNOTREG == hr) // not supported before Windows 7 + { + ExitFunction1(hr = S_OK); + } + BalExitOnFailure(hr, "Failed to create ITaskbarList3. Continuing."); + + m_uTaskbarButtonCreatedMessage = ::RegisterWindowMessageW(L"TaskbarButtonCreated"); + BalExitOnNullWithLastError(m_uTaskbarButtonCreatedMessage, hr, "Failed to get TaskbarButtonCreated message. Continuing."); + + LExit: + return; + } + + // + // DestroyMainWindow - clean up all the window registration. + // + void DestroyMainWindow() + { + if (::IsWindow(m_hWnd)) + { + ::DestroyWindow(m_hWnd); + m_hWnd = NULL; + m_fTaskbarButtonOK = FALSE; + } + + if (m_fRegistered) + { + ::UnregisterClassW(WIXSTDBA_WINDOW_CLASS, m_hModule); + m_fRegistered = FALSE; + } + } + + static LRESULT CallDefaultWndProc( + __in CWixStandardBootstrapperApplication* pBA, + __in HWND hWnd, + __in UINT uMsg, + __in WPARAM wParam, + __in LPARAM lParam + ) + { + LRESULT lres = NULL; + THEME* pTheme = NULL; + HRESULT hr = S_OK; + BA_FUNCTIONS_WNDPROC_ARGS wndProcArgs = { }; + BA_FUNCTIONS_WNDPROC_RESULTS wndProcResults = { }; + + if (pBA) + { + pTheme = pBA->m_pTheme; + + if (pBA->m_pfnBAFunctionsProc) + { + wndProcArgs.cbSize = sizeof(wndProcArgs); + wndProcArgs.pTheme = pTheme; + wndProcArgs.hWnd = hWnd; + wndProcArgs.uMsg = uMsg; + wndProcArgs.wParam = wParam; + wndProcArgs.lParam = lParam; + wndProcResults.cbSize = sizeof(wndProcResults); + + hr = pBA->m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_WNDPROC, &wndProcArgs, &wndProcResults, pBA->m_pvBAFunctionsProcContext); + if (E_NOTIMPL != hr) + { + lres = wndProcResults.lres; + ExitFunction(); + } + } + } + + lres = ThemeDefWindowProc(pTheme, hWnd, uMsg, wParam, lParam); + + LExit: + return lres; + } + + // + // WndProc - standard windows message handler. + // + static LRESULT CALLBACK WndProc( + __in HWND hWnd, + __in UINT uMsg, + __in WPARAM wParam, + __in LPARAM lParam + ) + { +#pragma warning(suppress:4312) + CWixStandardBootstrapperApplication* pBA = reinterpret_cast(::GetWindowLongPtrW(hWnd, GWLP_USERDATA)); + BOOL fCancel = FALSE; + + switch (uMsg) + { + case WM_NCCREATE: + { + LPCREATESTRUCT lpcs = reinterpret_cast(lParam); + pBA = reinterpret_cast(lpcs->lpCreateParams); +#pragma warning(suppress:4244) + ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, reinterpret_cast(pBA)); + } + break; + + case WM_NCDESTROY: + { + LRESULT lres = CallDefaultWndProc(pBA, hWnd, uMsg, wParam, lParam); + ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, 0); + ::PostQuitMessage(0); + return lres; + } + + case WM_CREATE: + if (!pBA->OnCreate(hWnd)) + { + return -1; + } + break; + + case WM_QUERYENDSESSION: + fCancel = true; + pBA->OnSystemShutdown(static_cast(lParam), &fCancel); + return !fCancel; + + case WM_CLOSE: + // If the user chose not to close, do *not* let the default window proc handle the message. + if (!pBA->OnClose()) + { + return 0; + } + break; + + case WM_WIXSTDBA_SHOW_HELP: + pBA->OnShowHelp(); + return 0; + + case WM_WIXSTDBA_DETECT_PACKAGES: + pBA->OnDetect(); + return 0; + + case WM_WIXSTDBA_PLAN_PACKAGES: + pBA->OnPlan(static_cast(lParam)); + return 0; + + case WM_WIXSTDBA_APPLY_PACKAGES: + pBA->OnApply(); + return 0; + + case WM_WIXSTDBA_CHANGE_STATE: + pBA->OnChangeState(static_cast(lParam)); + return 0; + + case WM_WIXSTDBA_SHOW_FAILURE: + pBA->OnShowFailure(); + return 0; + + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case BN_CLICKED: + switch (LOWORD(wParam)) + { + case WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX: + pBA->OnClickAcceptCheckbox(); + return 0; + + case WIXSTDBA_CONTROL_INSTALL_BUTTON: + pBA->OnClickInstallButton(); + return 0; + + case WIXSTDBA_CONTROL_REPAIR_BUTTON: + pBA->OnClickRepairButton(); + return 0; + + case WIXSTDBA_CONTROL_UNINSTALL_BUTTON: + pBA->OnClickUninstallButton(); + return 0; + + case WIXSTDBA_CONTROL_LAUNCH_BUTTON: + pBA->OnClickLaunchButton(); + return 0; + + case WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON: __fallthrough; + case WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON: + pBA->OnClickRestartButton(); + return 0; + + case WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON: + pBA->OnClickCloseButton(); + return 0; + } + break; + } + break; + + case WM_NOTIFY: + if (lParam) + { + LPNMHDR pnmhdr = reinterpret_cast(lParam); + switch (pnmhdr->code) + { + case NM_CLICK: __fallthrough; + case NM_RETURN: + switch (static_cast(pnmhdr->idFrom)) + { + case WIXSTDBA_CONTROL_EULA_LINK: + pBA->OnClickEulaLink(); + return 1; + case WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK: + pBA->OnClickLogFileLink(); + return 1; + } + } + } + break; + } + + if (pBA && pBA->m_pTaskbarList && uMsg == pBA->m_uTaskbarButtonCreatedMessage) + { + pBA->m_fTaskbarButtonOK = TRUE; + return 0; + } + + return CallDefaultWndProc(pBA, hWnd, uMsg, wParam, lParam); + } + + + // + // OnCreate - finishes loading the theme. + // + BOOL OnCreate( + __in HWND hWnd + ) + { + HRESULT hr = S_OK; + LPWSTR sczLicenseFormatted = NULL; + LPWSTR sczLicensePath = NULL; + LPWSTR sczLicenseDirectory = NULL; + LPWSTR sczLicenseFilename = NULL; + BA_FUNCTIONS_ONTHEMELOADED_ARGS themeLoadedArgs = { }; + BA_FUNCTIONS_ONTHEMELOADED_RESULTS themeLoadedResults = { }; + + hr = ThemeLoadControls(m_pTheme, hWnd, vrgInitControls, countof(vrgInitControls)); + BalExitOnFailure(hr, "Failed to load theme controls."); + + C_ASSERT(COUNT_WIXSTDBA_PAGE == countof(vrgwzPageNames)); + C_ASSERT(countof(m_rgdwPageIds) == countof(vrgwzPageNames)); + + ThemeGetPageIds(m_pTheme, vrgwzPageNames, m_rgdwPageIds, countof(m_rgdwPageIds)); + + // Load the RTF EULA control with text if the control exists. + if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT)) + { + hr = (m_sczLicenseFile && *m_sczLicenseFile) ? S_OK : E_INVALIDDATA; + if (SUCCEEDED(hr)) + { + hr = StrAllocString(&sczLicenseFormatted, m_sczLicenseFile, 0); + if (SUCCEEDED(hr)) + { + hr = LocLocalizeString(m_pWixLoc, &sczLicenseFormatted); + if (SUCCEEDED(hr)) + { + // Assume there is no hidden variables to be formatted + // so don't worry about securely freeing it. + hr = BalFormatString(sczLicenseFormatted, &sczLicenseFormatted); + if (SUCCEEDED(hr)) + { + hr = PathRelativeToModule(&sczLicensePath, sczLicenseFormatted, m_hModule); + if (SUCCEEDED(hr)) + { + hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); + if (SUCCEEDED(hr)) + { + hr = StrAllocString(&sczLicenseFilename, PathFile(sczLicenseFormatted), 0); + if (SUCCEEDED(hr)) + { + hr = LocProbeForFile(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath); + if (SUCCEEDED(hr)) + { + hr = ThemeLoadRichEditFromFile(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT, sczLicensePath, m_hModule); + } + } + } + } + } + } + } + } + + if (FAILED(hr)) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Failed to load file into license richedit control from path '%ls' manifest value: %ls", sczLicensePath, m_sczLicenseFile); + hr = S_OK; + } + } + + if (m_pfnBAFunctionsProc) + { + themeLoadedArgs.cbSize = sizeof(themeLoadedArgs); + themeLoadedArgs.pTheme = m_pTheme; + themeLoadedArgs.pWixLoc = m_pWixLoc; + themeLoadedResults.cbSize = sizeof(themeLoadedResults); + hr = m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONTHEMELOADED, &themeLoadedArgs, &themeLoadedResults, m_pvBAFunctionsProcContext); + BalExitOnFailure(hr, "BAFunctions OnThemeLoaded failed."); + } + + LExit: + ReleaseStr(sczLicenseFilename); + ReleaseStr(sczLicenseDirectory); + ReleaseStr(sczLicensePath); + ReleaseStr(sczLicenseFormatted); + + return SUCCEEDED(hr); + } + + + // + // OnShowFailure - display the failure page. + // + void OnShowFailure() + { + SetState(WIXSTDBA_STATE_FAILED, S_OK); + + // If the UI should be visible, display it now and hide the splash screen + if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) + { + ::ShowWindow(m_pTheme->hwndParent, SW_SHOW); + } + + m_pEngine->CloseSplashScreen(); + + return; + } + + + // + // OnShowHelp - display the help page. + // + void OnShowHelp() + { + SetState(WIXSTDBA_STATE_HELP, S_OK); + + // If the UI should be visible, display it now and hide the splash screen + if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) + { + ::ShowWindow(m_pTheme->hwndParent, SW_SHOW); + } + + m_pEngine->CloseSplashScreen(); + + return; + } + + + // + // OnDetect - start the processing of packages. + // + void OnDetect() + { + HRESULT hr = S_OK; + + SetState(WIXSTDBA_STATE_DETECTING, hr); + + // If the UI should be visible, display it now and hide the splash screen + if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) + { + ::ShowWindow(m_pTheme->hwndParent, SW_SHOW); + } + + m_pEngine->CloseSplashScreen(); + + // Tell the core we're ready for the packages to be processed now. + hr = m_pEngine->Detect(); + BalExitOnFailure(hr, "Failed to start detecting chain."); + + LExit: + if (FAILED(hr)) + { + SetState(WIXSTDBA_STATE_DETECTING, hr); + } + + return; + } + + + // + // OnPlan - plan the detected changes. + // + void OnPlan( + __in BOOTSTRAPPER_ACTION action + ) + { + HRESULT hr = S_OK; + + m_plannedAction = action; + + // If we are going to apply a downgrade, bail. + if (m_fDowngrading && BOOTSTRAPPER_ACTION_UNINSTALL < action) + { + if (m_fSuppressDowngradeFailure) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "A newer version of this product is installed but downgrade failure has been suppressed; continuing..."); + } + else + { + hr = HRESULT_FROM_WIN32(ERROR_PRODUCT_VERSION); + BalExitOnFailure(hr, "Cannot install a product when a newer version is installed."); + } + } + + SetState(WIXSTDBA_STATE_PLANNING, hr); + + hr = m_pEngine->Plan(action); + BalExitOnFailure(hr, "Failed to start planning packages."); + + LExit: + if (FAILED(hr)) + { + SetState(WIXSTDBA_STATE_PLANNING, hr); + } + + return; + } + + + // + // OnApply - apply the packages. + // + void OnApply() + { + HRESULT hr = S_OK; + + SetState(WIXSTDBA_STATE_APPLYING, hr); + SetProgressState(hr); + SetTaskbarButtonProgress(0); + + hr = m_pEngine->Apply(m_hWnd); + BalExitOnFailure(hr, "Failed to start applying packages."); + + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, TRUE); // ensure the cancel button is enabled before starting. + + LExit: + if (FAILED(hr)) + { + SetState(WIXSTDBA_STATE_APPLYING, hr); + } + + return; + } + + + // + // OnChangeState - change state. + // + void OnChangeState( + __in WIXSTDBA_STATE state + ) + { + WIXSTDBA_STATE stateOld = m_state; + DWORD dwOldPageId = 0; + DWORD dwNewPageId = 0; + LPWSTR sczText = NULL; + LPWSTR sczUnformattedText = NULL; + LPWSTR sczControlState = NULL; + LPWSTR sczControlName = NULL; + + m_state = state; + + // If our install is at the end (success or failure) and we're not showing full UI or + // we successfully installed the prerequisite then exit (prompt for restart if required). + if ((WIXSTDBA_STATE_APPLIED <= m_state && BOOTSTRAPPER_DISPLAY_FULL > m_command.display) || + (WIXSTDBA_STATE_APPLIED == m_state && m_fPrereq)) + { + // If a restart was required but we were not automatically allowed to + // accept the reboot then do the prompt. + if (m_fRestartRequired && !m_fAllowRestart) + { + StrAllocFromError(&sczUnformattedText, HRESULT_FROM_WIN32(ERROR_SUCCESS_REBOOT_REQUIRED), NULL); + + int nResult = ::MessageBoxW(m_hWnd, sczUnformattedText ? sczUnformattedText : L"The requested operation is successful. Changes will not be effective until the system is rebooted.", m_pTheme->sczCaption, MB_ICONEXCLAMATION | MB_OKCANCEL); + m_fAllowRestart = (IDOK == nResult); + } + + // Quietly exit. + ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); + } + else // try to change the pages. + { + DeterminePageId(stateOld, &dwOldPageId); + DeterminePageId(m_state, &dwNewPageId); + + if (dwOldPageId != dwNewPageId) + { + // Enable disable controls per-page. + if (m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL] == dwNewPageId) // on the "Install" page, ensure the install button is enabled/disabled correctly. + { + LONGLONG llElevated = 0; + if (m_Bundle.fPerMachine) + { + BalGetNumericVariable(WIXBUNDLE_VARIABLE_ELEVATED, &llElevated); + } + ThemeControlElevates(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON, (m_Bundle.fPerMachine && !llElevated)); + + // If the EULA control exists, show it only if a license URL is provided as well. + if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_EULA_LINK)) + { + BOOL fEulaLink = (m_sczLicenseUrl && *m_sczLicenseUrl); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_EULA_LINK, fEulaLink); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX, fEulaLink); + } + + BOOL fAcceptedLicense = !ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX) || !ThemeControlEnabled(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX) || ThemeIsControlChecked(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON, fAcceptedLicense); + } + else if (m_rgdwPageIds[WIXSTDBA_PAGE_MODIFY] == dwNewPageId) + { + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_REPAIR_BUTTON, !m_fSuppressRepair); + } + else if (m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS] == dwNewPageId) // on the "Success" page, check if the restart or launch button should be enabled. + { + BOOL fShowRestartButton = FALSE; + BOOL fLaunchTargetExists = FALSE; + if (m_fRestartRequired) + { + if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart) + { + fShowRestartButton = TRUE; + } + } + else if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON)) + { + fLaunchTargetExists = BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); + } + + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON, fLaunchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < m_plannedAction); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, fShowRestartButton); + } + else if (m_rgdwPageIds[WIXSTDBA_PAGE_FAILURE] == dwNewPageId) // on the "Failure" page, show error message and check if the restart button should be enabled. + { + BOOL fShowLogLink = (m_Bundle.sczLogVariable && *m_Bundle.sczLogVariable); // if there is a log file variable then we'll assume the log file exists. + BOOL fShowErrorMessage = FALSE; + BOOL fShowRestartButton = FALSE; + + if (FAILED(m_hrFinal)) + { + // If we know the failure message, use that. + if (m_sczFailedMessage && *m_sczFailedMessage) + { + StrAllocString(&sczUnformattedText, m_sczFailedMessage, 0); + } + else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal) + { + HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.NET452WIN7RTMErrorMessage)", 0); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to initialize NET452WIN7RTMErrorMessage loc identifier."); + } + else + { + hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to localize NET452WIN7RTMErrorMessage: %ls", sczUnformattedText); + ReleaseNullStr(sczUnformattedText); + } + } + } + else // try to get the error message from the error code. + { + StrAllocFromError(&sczUnformattedText, m_hrFinal, NULL); + if (!sczUnformattedText || !*sczUnformattedText) + { + StrAllocFromError(&sczUnformattedText, E_FAIL, NULL); + } + } + + if (E_WIXSTDBA_CONDITION_FAILED == m_hrFinal) + { + if (sczUnformattedText) + { + StrAllocString(&sczText, sczUnformattedText, 0); + } + } + else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal) + { + if (sczUnformattedText) + { + BalFormatString(sczUnformattedText, &sczText); + } + } + else + { + StrAllocFormatted(&sczText, L"0x%08x - %ls", m_hrFinal, sczUnformattedText); + } + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, sczText); + fShowErrorMessage = TRUE; + } + + if (m_fRestartRequired) + { + if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart) + { + fShowRestartButton = TRUE; + } + } + + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, fShowLogLink); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, fShowErrorMessage); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, fShowRestartButton); + } + + HRESULT hr = ThemeShowPage(m_pTheme, dwOldPageId, SW_HIDE); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to hide page: %u", dwOldPageId); + } + + hr = ThemeShowPage(m_pTheme, dwNewPageId, SW_SHOW); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to show page: %u", dwOldPageId); + } + + // On the install page set the focus to the install button or the next enabled control if install is disabled. + if (m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL] == dwNewPageId) + { + ThemeSetFocus(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON); + } + } + } + + ReleaseStr(sczText); + ReleaseStr(sczUnformattedText); + ReleaseStr(sczControlState); + ReleaseStr(sczControlName); + } + + + // + // OnClose - called when the window is trying to be closed. + // + BOOL OnClose() + { + BOOL fClose = FALSE; + BOOL fCancel = FALSE; + + // If we've already succeeded or failed or showing the help page, just close (prompts are annoying if the bootstrapper is done). + if (WIXSTDBA_STATE_APPLIED <= m_state || WIXSTDBA_STATE_HELP == m_state) + { + fClose = TRUE; + } + else // prompt the user or force the cancel if there is no UI. + { + fClose = PromptCancel(m_hWnd, BOOTSTRAPPER_DISPLAY_FULL != m_command.display, m_sczConfirmCloseMessage ? m_sczConfirmCloseMessage : L"Are you sure you want to cancel?", m_pTheme->sczCaption); + fCancel = fClose; + } + + // If we're doing progress then we never close, we just cancel to let rollback occur. + if (WIXSTDBA_STATE_APPLYING <= m_state && WIXSTDBA_STATE_APPLIED > m_state) + { + // If we canceled, disable cancel button since clicking it again is silly. + if (fClose) + { + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, FALSE); + } + + fClose = FALSE; + } + + if (fClose) + { + DWORD dwCurrentPageId = 0; + DeterminePageId(m_state, &dwCurrentPageId); + + // Hide the current page to let thmutil do its thing with variables. + ThemeShowPageEx(m_pTheme, dwCurrentPageId, SW_HIDE, fCancel ? THEME_SHOW_PAGE_REASON_CANCEL : THEME_SHOW_PAGE_REASON_DEFAULT); + } + + return fClose; + } + + + // + // OnClickAcceptCheckbox - allow the install to continue. + // + void OnClickAcceptCheckbox() + { + BOOL fAcceptedLicense = ThemeIsControlChecked(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON, fAcceptedLicense); + } + + + // + // OnClickInstallButton - start the install by planning the packages. + // + void OnClickInstallButton() + { + this->OnPlan(BOOTSTRAPPER_ACTION_INSTALL); + } + + + // + // OnClickRepairButton - start the repair. + // + void OnClickRepairButton() + { + this->OnPlan(BOOTSTRAPPER_ACTION_REPAIR); + } + + + // + // OnClickUninstallButton - start the uninstall. + // + void OnClickUninstallButton() + { + this->OnPlan(BOOTSTRAPPER_ACTION_UNINSTALL); + } + + + // + // OnClickCloseButton - close the application. + // + void OnClickCloseButton() + { + ::SendMessageW(m_hWnd, WM_CLOSE, 0, 0); + } + + + // + // OnClickEulaLink - show the end user license agreement. + // + void OnClickEulaLink() + { + HRESULT hr = S_OK; + LPWSTR sczLicenseUrl = NULL; + LPWSTR sczLicensePath = NULL; + LPWSTR sczLicenseDirectory = NULL; + LPWSTR sczLicenseFilename = NULL; + URI_PROTOCOL protocol = URI_PROTOCOL_UNKNOWN; + + hr = StrAllocString(&sczLicenseUrl, m_sczLicenseUrl, 0); + BalExitOnFailure(hr, "Failed to copy license URL: %ls", m_sczLicenseUrl); + + hr = LocLocalizeString(m_pWixLoc, &sczLicenseUrl); + BalExitOnFailure(hr, "Failed to localize license URL: %ls", m_sczLicenseUrl); + + // Assume there is no hidden variables to be formatted + // so don't worry about securely freeing it. + hr = BalFormatString(sczLicenseUrl, &sczLicenseUrl); + BalExitOnFailure(hr, "Failed to get formatted license URL: %ls", m_sczLicenseUrl); + + hr = UriProtocol(sczLicenseUrl, &protocol); + if (FAILED(hr) || URI_PROTOCOL_UNKNOWN == protocol) + { + // Probe for localized license file + hr = PathRelativeToModule(&sczLicensePath, sczLicenseUrl, m_hModule); + if (SUCCEEDED(hr)) + { + hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); + if (SUCCEEDED(hr)) + { + hr = LocProbeForFile(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath); + } + } + } + + hr = ShelExecUnelevated(sczLicensePath ? sczLicensePath : sczLicenseUrl, NULL, L"open", NULL, SW_SHOWDEFAULT); + BalExitOnFailure(hr, "Failed to launch URL to EULA."); + + LExit: + ReleaseStr(sczLicensePath); + ReleaseStr(sczLicenseUrl); + ReleaseStr(sczLicenseDirectory); + ReleaseStr(sczLicenseFilename); + + return; + } + + + // + // OnClickLaunchButton - launch the app from the success page. + // + void OnClickLaunchButton() + { + HRESULT hr = S_OK; + LPWSTR sczUnformattedLaunchTarget = NULL; + LPWSTR sczLaunchTarget = NULL; + LPWSTR sczLaunchTargetElevatedId = NULL; + LPWSTR sczUnformattedArguments = NULL; + LPWSTR sczArguments = NULL; + LPWSTR sczUnformattedLaunchFolder = NULL; + LPWSTR sczLaunchFolder = NULL; + int nCmdShow = SW_SHOWNORMAL; + + hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH, &sczUnformattedLaunchTarget); + BalExitOnFailure(hr, "Failed to get launch target variable '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); + + hr = BalFormatString(sczUnformattedLaunchTarget, &sczLaunchTarget); + BalExitOnFailure(hr, "Failed to format launch target variable: %ls", sczUnformattedLaunchTarget); + + if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID)) + { + hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID, &sczLaunchTargetElevatedId); + BalExitOnFailure(hr, "Failed to get launch target elevated id '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID); + } + + if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS)) + { + hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS, &sczUnformattedArguments); + BalExitOnFailure(hr, "Failed to get launch arguments '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS); + } + + if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_HIDDEN)) + { + nCmdShow = SW_HIDE; + } + + if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER)) + { + hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER, &sczUnformattedLaunchFolder); + BalExitOnFailure(hr, "Failed to get launch working directory variable '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER); + } + + if (sczLaunchTargetElevatedId && !m_fTriedToLaunchElevated) + { + m_fTriedToLaunchElevated = TRUE; + hr = m_pEngine->LaunchApprovedExe(m_hWnd, sczLaunchTargetElevatedId, sczUnformattedArguments, 0); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to launch elevated target: %ls", sczLaunchTargetElevatedId); + + //try with ShelExec next time + OnClickLaunchButton(); + } + } + else + { + if (sczUnformattedArguments) + { + hr = BalFormatString(sczUnformattedArguments, &sczArguments); + BalExitOnFailure(hr, "Failed to format launch arguments variable: %ls", sczUnformattedArguments); + } + + if (sczUnformattedLaunchFolder) + { + hr = BalFormatString(sczUnformattedLaunchFolder, &sczLaunchFolder); + BalExitOnFailure(hr, "Failed to format launch working directory variable: %ls", sczUnformattedLaunchFolder); + } + + hr = ShelExec(sczLaunchTarget, sczArguments, L"open", sczLaunchFolder, nCmdShow, m_hWnd, NULL); + BalExitOnFailure(hr, "Failed to launch target: %ls", sczLaunchTarget); + + ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); + } + + LExit: + StrSecureZeroFreeString(sczLaunchFolder); + ReleaseStr(sczUnformattedLaunchFolder); + StrSecureZeroFreeString(sczArguments); + ReleaseStr(sczUnformattedArguments); + ReleaseStr(sczLaunchTargetElevatedId); + StrSecureZeroFreeString(sczLaunchTarget); + ReleaseStr(sczUnformattedLaunchTarget); + + return; + } + + + // + // OnClickRestartButton - allows the restart and closes the app. + // + void OnClickRestartButton() + { + AssertSz(m_fRestartRequired, "Restart must be requested to be able to click on the restart button."); + + m_fAllowRestart = TRUE; + ::SendMessageW(m_hWnd, WM_CLOSE, 0, 0); + + return; + } + + + // + // OnClickLogFileLink - show the log file. + // + void OnClickLogFileLink() + { + HRESULT hr = S_OK; + LPWSTR sczLogFile = NULL; + + hr = BalGetStringVariable(m_Bundle.sczLogVariable, &sczLogFile); + BalExitOnFailure(hr, "Failed to get log file variable '%ls'.", m_Bundle.sczLogVariable); + + hr = ShelExecUnelevated(L"notepad.exe", sczLogFile, L"open", NULL, SW_SHOWDEFAULT); + BalExitOnFailure(hr, "Failed to open log file target: %ls", sczLogFile); + + LExit: + ReleaseStr(sczLogFile); + + return; + } + + + // + // SetState + // + void SetState( + __in WIXSTDBA_STATE state, + __in HRESULT hrStatus + ) + { + if (FAILED(hrStatus)) + { + m_hrFinal = hrStatus; + } + + if (FAILED(m_hrFinal)) + { + state = WIXSTDBA_STATE_FAILED; + } + + if (m_state < state) + { + ::PostMessageW(m_hWnd, WM_WIXSTDBA_CHANGE_STATE, 0, state); + } + } + + + void DeterminePageId( + __in WIXSTDBA_STATE state, + __out DWORD* pdwPageId + ) + { + if (BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display) + { + switch (state) + { + case WIXSTDBA_STATE_INITIALIZED: + *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_command.action ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING]; + break; + + case WIXSTDBA_STATE_HELP: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_HELP]; + break; + + case WIXSTDBA_STATE_DETECTING: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_LOADING] ? m_rgdwPageIds[WIXSTDBA_PAGE_LOADING] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] ? m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS]; + break; + + case WIXSTDBA_STATE_DETECTED: __fallthrough; + case WIXSTDBA_STATE_PLANNING: __fallthrough; + case WIXSTDBA_STATE_PLANNED: __fallthrough; + case WIXSTDBA_STATE_APPLYING: __fallthrough; + case WIXSTDBA_STATE_CACHING: __fallthrough; + case WIXSTDBA_STATE_CACHED: __fallthrough; + case WIXSTDBA_STATE_EXECUTING: __fallthrough; + case WIXSTDBA_STATE_EXECUTED: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] ? m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS]; + break; + + default: + *pdwPageId = 0; + break; + } + } + else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display) + { + switch (state) + { + case WIXSTDBA_STATE_INITIALIZING: + *pdwPageId = 0; + break; + + case WIXSTDBA_STATE_INITIALIZED: + *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_command.action ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING]; + break; + + case WIXSTDBA_STATE_HELP: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_HELP]; + break; + + case WIXSTDBA_STATE_DETECTING: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_LOADING]; + break; + + case WIXSTDBA_STATE_DETECTED: + switch (m_command.action) + { + case BOOTSTRAPPER_ACTION_INSTALL: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL]; + break; + + case BOOTSTRAPPER_ACTION_MODIFY: __fallthrough; + case BOOTSTRAPPER_ACTION_REPAIR: __fallthrough; + case BOOTSTRAPPER_ACTION_UNINSTALL: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_MODIFY]; + break; + } + break; + + case WIXSTDBA_STATE_PLANNING: __fallthrough; + case WIXSTDBA_STATE_PLANNED: __fallthrough; + case WIXSTDBA_STATE_APPLYING: __fallthrough; + case WIXSTDBA_STATE_CACHING: __fallthrough; + case WIXSTDBA_STATE_CACHED: __fallthrough; + case WIXSTDBA_STATE_EXECUTING: __fallthrough; + case WIXSTDBA_STATE_EXECUTED: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS]; + break; + + case WIXSTDBA_STATE_APPLIED: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS]; + break; + + case WIXSTDBA_STATE_FAILED: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_FAILURE]; + break; + } + } + } + + + HRESULT EvaluateConditions() + { + HRESULT hr = S_OK; + BOOL fResult = FALSE; + + for (DWORD i = 0; i < m_Conditions.cConditions; ++i) + { + BAL_CONDITION* pCondition = m_Conditions.rgConditions + i; + + hr = BalConditionEvaluate(pCondition, m_pEngine, &fResult, &m_sczFailedMessage); + BalExitOnFailure(hr, "Failed to evaluate condition."); + + if (!fResult) + { + hr = E_WIXSTDBA_CONDITION_FAILED; + BalExitOnFailure(hr, "%ls", m_sczFailedMessage); + } + } + + ReleaseNullStrSecure(m_sczFailedMessage); + + LExit: + return hr; + } + + void UpdateCacheProgress( + __in DWORD dwOverallPercentage + ) + { + WCHAR wzProgress[5] = { }; + + ::StringCchPrintfW(wzProgress, countof(wzProgress), L"%u%%", dwOverallPercentage); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_TEXT, wzProgress); + + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_BAR, dwOverallPercentage); + + m_dwCalculatedCacheProgress = dwOverallPercentage * WIXSTDBA_ACQUIRE_PERCENTAGE / 100; + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); + + SetTaskbarButtonProgress(m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); + } + + + void SetTaskbarButtonProgress( + __in DWORD dwOverallPercentage + ) + { + HRESULT hr = S_OK; + + if (m_fTaskbarButtonOK) + { + hr = m_pTaskbarList->SetProgressValue(m_hWnd, dwOverallPercentage, 100UL); + BalExitOnFailure(hr, "Failed to set taskbar button progress to: %d%%.", dwOverallPercentage); + } + + LExit: + return; + } + + + void SetTaskbarButtonState( + __in TBPFLAG tbpFlags + ) + { + HRESULT hr = S_OK; + + if (m_fTaskbarButtonOK) + { + hr = m_pTaskbarList->SetProgressState(m_hWnd, tbpFlags); + BalExitOnFailure(hr, "Failed to set taskbar button state.", tbpFlags); + } + + LExit: + return; + } + + + void SetProgressState( + __in HRESULT hrStatus + ) + { + TBPFLAG flag = TBPF_NORMAL; + + if (IsCanceled() || HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT) == hrStatus) + { + flag = TBPF_PAUSED; + } + else if (IsRollingBack() || FAILED(hrStatus)) + { + flag = TBPF_ERROR; + } + + SetTaskbarButtonState(flag); + } + + + HRESULT LoadBAFunctions( + __in IXMLDOMDocument* pixdManifest + ) + { + HRESULT hr = S_OK; + IXMLDOMNode* pBAFunctionsNode = NULL; + IXMLDOMNode* pPayloadNode = NULL; + LPWSTR sczPayloadId = NULL; + LPWSTR sczPayloadXPath = NULL; + LPWSTR sczBafName = NULL; + LPWSTR sczBafPath = NULL; + BA_FUNCTIONS_CREATE_ARGS bafCreateArgs = { }; + BA_FUNCTIONS_CREATE_RESULTS bafCreateResults = { }; + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBalBAFunctions", &pBAFunctionsNode); + BalExitOnFailure(hr, "Failed to read WixBalBAFunctions node from BootstrapperApplicationData.xml."); + + if (S_FALSE == hr) + { + ExitFunction(); + } + + hr = XmlGetAttributeEx(pBAFunctionsNode, L"PayloadId", &sczPayloadId); + BalExitOnFailure(hr, "Failed to get BAFunctions PayloadId."); + + hr = StrAllocFormatted(&sczPayloadXPath, L"/BootstrapperApplicationData/WixPayloadProperties[@Payload='%ls']", sczPayloadId); + BalExitOnFailure(hr, "Failed to format BAFunctions payload XPath."); + + hr = XmlSelectSingleNode(pixdManifest, sczPayloadXPath, &pPayloadNode); + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + } + BalExitOnFailure(hr, "Failed to find WixPayloadProperties node for BAFunctions PayloadId: %ls.", sczPayloadId); + + hr = XmlGetAttributeEx(pPayloadNode, L"Name", &sczBafName); + BalExitOnFailure(hr, "Failed to get BAFunctions Name."); + + hr = PathRelativeToModule(&sczBafPath, sczBafName, m_hModule); + BalExitOnFailure(hr, "Failed to get path to BAFunctions DLL."); + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: LoadBAFunctions() - BAFunctions DLL %ls", sczBafPath); + + m_hBAFModule = ::LoadLibraryExW(sczBafPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + BalExitOnNullWithLastError(m_hBAFModule, hr, "WIXSTDBA: LoadBAFunctions() - Failed to load DLL %ls", sczBafPath); + + PFN_BA_FUNCTIONS_CREATE pfnBAFunctionsCreate = reinterpret_cast(::GetProcAddress(m_hBAFModule, "BAFunctionsCreate")); + BalExitOnNullWithLastError(pfnBAFunctionsCreate, hr, "Failed to get BAFunctionsCreate entry-point from: %ls", sczBafPath); + + bafCreateArgs.cbSize = sizeof(bafCreateArgs); + bafCreateArgs.qwBAFunctionsAPIVersion = MAKEQWORDVERSION(0, 0, 0, 2); // TODO: need to decide whether to keep this, and if so when to update it. + bafCreateArgs.pBootstrapperCreateArgs = &m_createArgs; + + bafCreateResults.cbSize = sizeof(bafCreateResults); + + hr = pfnBAFunctionsCreate(&bafCreateArgs, &bafCreateResults); + BalExitOnFailure(hr, "Failed to create BAFunctions."); + + m_pfnBAFunctionsProc = bafCreateResults.pfnBAFunctionsProc; + m_pvBAFunctionsProcContext = bafCreateResults.pvBAFunctionsProcContext; + + LExit: + if (m_hBAFModule && !m_pfnBAFunctionsProc) + { + ::FreeLibrary(m_hBAFModule); + m_hBAFModule = NULL; + } + ReleaseStr(sczBafPath); + ReleaseStr(sczBafName); + ReleaseStr(sczPayloadXPath); + ReleaseStr(sczPayloadId); + ReleaseObject(pBAFunctionsNode); + ReleaseObject(pPayloadNode); + + return hr; + } + + +public: + // + // Constructor - initialize member variables. + // + CWixStandardBootstrapperApplication( + __in HMODULE hModule, + __in BOOL fPrereq, + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs + ) : CBalBaseBootstrapperApplication(pEngine, pArgs, 3, 3000) + { + m_hModule = hModule; + memcpy_s(&m_command, sizeof(m_command), pArgs->pCommand, sizeof(BOOTSTRAPPER_COMMAND)); + memcpy_s(&m_createArgs, sizeof(m_createArgs), pArgs, sizeof(BOOTSTRAPPER_CREATE_ARGS)); + m_createArgs.pCommand = &m_command; + + if (fPrereq) + { + // Pre-req BA should only show help or do an install (to launch the Managed BA which can then do the right action). + if (BOOTSTRAPPER_ACTION_HELP != m_command.action) + { + m_command.action = BOOTSTRAPPER_ACTION_INSTALL; + } + } + else // maybe modify the action state if the bundle is or is not already installed. + { + LONGLONG llInstalled = 0; + HRESULT hr = BalGetNumericVariable(L"WixBundleInstalled", &llInstalled); + if (SUCCEEDED(hr) && BOOTSTRAPPER_RESUME_TYPE_REBOOT != m_command.resumeType && 0 < llInstalled && BOOTSTRAPPER_ACTION_INSTALL == m_command.action) + { + m_command.action = BOOTSTRAPPER_ACTION_MODIFY; + } + else if (0 == llInstalled && (BOOTSTRAPPER_ACTION_MODIFY == m_command.action || BOOTSTRAPPER_ACTION_REPAIR == m_command.action)) + { + m_command.action = BOOTSTRAPPER_ACTION_INSTALL; + } + } + + m_plannedAction = BOOTSTRAPPER_ACTION_UNKNOWN; + + // When resuming from restart doing some install-like operation, try to find the package that forced the + // restart. We'll use this information during planning. + m_sczAfterForcedRestartPackage = NULL; + + if (BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType && BOOTSTRAPPER_ACTION_UNINSTALL < m_command.action) + { + // Ensure the forced restart package variable is null when it is an empty string. + HRESULT hr = BalGetStringVariable(L"WixBundleForcedRestartPackage", &m_sczAfterForcedRestartPackage); + if (FAILED(hr) || !m_sczAfterForcedRestartPackage || !*m_sczAfterForcedRestartPackage) + { + ReleaseNullStr(m_sczAfterForcedRestartPackage); + } + } + + m_pWixLoc = NULL; + memset(&m_Bundle, 0, sizeof(m_Bundle)); + memset(&m_Conditions, 0, sizeof(m_Conditions)); + m_sczConfirmCloseMessage = NULL; + m_sczFailedMessage = NULL; + + m_sczLanguage = NULL; + m_pTheme = NULL; + memset(m_rgdwPageIds, 0, sizeof(m_rgdwPageIds)); + m_hUiThread = NULL; + m_fRegistered = FALSE; + m_hWnd = NULL; + + m_state = WIXSTDBA_STATE_INITIALIZING; + m_hrFinal = hrHostInitialization; + + m_fDowngrading = FALSE; + m_restartResult = BOOTSTRAPPER_APPLY_RESTART_NONE; + m_fRestartRequired = FALSE; + m_fAllowRestart = FALSE; + + m_sczLicenseFile = NULL; + m_sczLicenseUrl = NULL; + m_fSuppressDowngradeFailure = FALSE; + m_fSuppressRepair = FALSE; + m_fSupportCacheOnly = FALSE; + + m_sdOverridableVariables = NULL; + m_shPrereqSupportPackages = NULL; + m_rgPrereqPackages = NULL; + m_cPrereqPackages = 0; + m_pTaskbarList = NULL; + m_uTaskbarButtonCreatedMessage = UINT_MAX; + m_fTaskbarButtonOK = FALSE; + m_fShowingInternalUiThisPackage = FALSE; + m_fTriedToLaunchElevated = FALSE; + + m_fPrereq = fPrereq; + m_fPrereqInstalled = FALSE; + m_fPrereqAlreadyInstalled = FALSE; + + pEngine->AddRef(); + m_pEngine = pEngine; + + m_hBAFModule = NULL; + m_pfnBAFunctionsProc = NULL; + m_pvBAFunctionsProcContext = NULL; + } + + + // + // Destructor - release member variables. + // + ~CWixStandardBootstrapperApplication() + { + AssertSz(!::IsWindow(m_hWnd), "Window should have been destroyed before destructor."); + AssertSz(!m_pTheme, "Theme should have been released before destructor."); + + ReleaseObject(m_pTaskbarList); + ReleaseDict(m_sdOverridableVariables); + ReleaseDict(m_shPrereqSupportPackages); + ReleaseMem(m_rgPrereqPackages); + ReleaseStr(m_sczFailedMessage); + ReleaseStr(m_sczConfirmCloseMessage); + BalConditionsUninitialize(&m_Conditions); + BalInfoUninitialize(&m_Bundle); + LocFree(m_pWixLoc); + + ReleaseStr(m_sczLanguage); + ReleaseStr(m_sczLicenseFile); + ReleaseStr(m_sczLicenseUrl); + ReleaseStr(m_sczAfterForcedRestartPackage); + ReleaseNullObject(m_pEngine); + + if (m_hBAFModule) + { + PFN_BA_FUNCTIONS_DESTROY pfnBAFunctionsDestroy = reinterpret_cast(::GetProcAddress(m_hBAFModule, "BAFunctionsDestroy")); + if (pfnBAFunctionsDestroy) + { + pfnBAFunctionsDestroy(); + } + + ::FreeLibrary(m_hBAFModule); + m_hBAFModule = NULL; + } + } + +private: + HMODULE m_hModule; + BOOTSTRAPPER_CREATE_ARGS m_createArgs; + BOOTSTRAPPER_COMMAND m_command; + IBootstrapperEngine* m_pEngine; + BOOTSTRAPPER_ACTION m_plannedAction; + + LPWSTR m_sczAfterForcedRestartPackage; + + WIX_LOCALIZATION* m_pWixLoc; + BAL_INFO_BUNDLE m_Bundle; + BAL_CONDITIONS m_Conditions; + LPWSTR m_sczFailedMessage; + LPWSTR m_sczConfirmCloseMessage; + + LPWSTR m_sczLanguage; + THEME* m_pTheme; + DWORD m_rgdwPageIds[countof(vrgwzPageNames)]; + HANDLE m_hUiThread; + BOOL m_fRegistered; + HWND m_hWnd; + + WIXSTDBA_STATE m_state; + HRESULT m_hrFinal; + + BOOL m_fStartedExecution; + DWORD m_dwCalculatedCacheProgress; + DWORD m_dwCalculatedExecuteProgress; + + BOOL m_fDowngrading; + BOOTSTRAPPER_APPLY_RESTART m_restartResult; + BOOL m_fRestartRequired; + BOOL m_fAllowRestart; + + LPWSTR m_sczLicenseFile; + LPWSTR m_sczLicenseUrl; + BOOL m_fSuppressDowngradeFailure; + BOOL m_fSuppressRepair; + BOOL m_fSupportCacheOnly; + + STRINGDICT_HANDLE m_sdOverridableVariables; + + WIXSTDBA_PREREQ_PACKAGE* m_rgPrereqPackages; + DWORD m_cPrereqPackages; + STRINGDICT_HANDLE m_shPrereqSupportPackages; + + BOOL m_fPrereq; + BOOL m_fPrereqInstalled; + BOOL m_fPrereqAlreadyInstalled; + + ITaskbarList3* m_pTaskbarList; + UINT m_uTaskbarButtonCreatedMessage; + BOOL m_fTaskbarButtonOK; + BOOL m_fShowingInternalUiThisPackage; + BOOL m_fTriedToLaunchElevated; + + HMODULE m_hBAFModule; + PFN_BA_FUNCTIONS_PROC m_pfnBAFunctionsProc; + LPVOID m_pvBAFunctionsProcContext; +}; + + +// +// CreateBootstrapperApplication - creates a new IBootstrapperApplication object. +// +HRESULT CreateBootstrapperApplication( + __in HMODULE hModule, + __in BOOL fPrereq, + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + CWixStandardBootstrapperApplication* pApplication = NULL; + + pApplication = new CWixStandardBootstrapperApplication(hModule, fPrereq, hrHostInitialization, pEngine, pArgs); + ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new standard bootstrapper application object."); + + pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; + pResults->pvBootstrapperApplicationProcContext = pApplication; + pApplication = NULL; + +LExit: + ReleaseObject(pApplication); + return hr; +} + + +static HRESULT DAPI EvaluateVariableConditionCallback( + __in_z LPCWSTR wzCondition, + __out BOOL* pf, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalEvaluateCondition(wzCondition, pf); +} + + +static HRESULT DAPI FormatVariableStringCallback( + __in_z LPCWSTR wzFormat, + __inout LPWSTR* psczOut, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalFormatString(wzFormat, psczOut); +} + + +static HRESULT DAPI GetVariableNumericCallback( + __in_z LPCWSTR wzVariable, + __out LONGLONG* pllValue, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalGetNumericVariable(wzVariable, pllValue); +} + + +static HRESULT DAPI SetVariableNumericCallback( + __in_z LPCWSTR wzVariable, + __in LONGLONG llValue, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalSetNumericVariable(wzVariable, llValue); +} + + +static HRESULT DAPI GetVariableStringCallback( + __in_z LPCWSTR wzVariable, + __inout LPWSTR* psczValue, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalGetStringVariable(wzVariable, psczValue); +} + + +static HRESULT DAPI SetVariableStringCallback( + __in_z LPCWSTR wzVariable, + __in_z_opt LPCWSTR wzValue, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalSetStringVariable(wzVariable, wzValue); +} + +static LPCSTR LoggingRequestStateToString( + __in BOOTSTRAPPER_REQUEST_STATE requestState + ) +{ + switch (requestState) + { + case BOOTSTRAPPER_REQUEST_STATE_NONE: + return "None"; + case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT: + return "ForceAbsent"; + case BOOTSTRAPPER_REQUEST_STATE_ABSENT: + return "Absent"; + case BOOTSTRAPPER_REQUEST_STATE_CACHE: + return "Cache"; + case BOOTSTRAPPER_REQUEST_STATE_PRESENT: + return "Present"; + case BOOTSTRAPPER_REQUEST_STATE_REPAIR: + return "Repair"; + default: + return "Invalid"; + } +} + +static LPCSTR LoggingMsiFeatureStateToString( + __in BOOTSTRAPPER_FEATURE_STATE featureState + ) +{ + switch (featureState) + { + case BOOTSTRAPPER_FEATURE_STATE_UNKNOWN: + return "Unknown"; + case BOOTSTRAPPER_FEATURE_STATE_ABSENT: + return "Absent"; + case BOOTSTRAPPER_FEATURE_STATE_ADVERTISED: + return "Advertised"; + case BOOTSTRAPPER_FEATURE_STATE_LOCAL: + return "Local"; + case BOOTSTRAPPER_FEATURE_STATE_SOURCE: + return "Source"; + default: + return "Invalid"; + } +} diff --git a/src/wixstdba/precomp.h b/src/wixstdba/precomp.h new file mode 100644 index 00000000..a0390fe2 --- /dev/null +++ b/src/wixstdba/precomp.h @@ -0,0 +1,51 @@ +#pragma once +// 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. + + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "dutil.h" +#include "apputil.h" +#include "memutil.h" +#include "dictutil.h" +#include "dirutil.h" +#include "fileutil.h" +#include "locutil.h" +#include "logutil.h" +#include "pathutil.h" +#include "resrutil.h" +#include "shelutil.h" +#include "strutil.h" +#include "thmutil.h" +#include "uriutil.h" +#include "xmlutil.h" + +#include "BootstrapperEngine.h" +#include "BootstrapperApplication.h" +#include "IBootstrapperEngine.h" +#include "IBootstrapperApplication.h" + +#include "balutil.h" +#include "balinfo.h" +#include "balcondition.h" + +#include "BAFunctions.h" + +#include "wixstdba.messages.h" + +HRESULT CreateBootstrapperApplication( + __in HMODULE hModule, + __in BOOL fPrereq, + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); diff --git a/src/wixstdba/resource.h b/src/wixstdba/resource.h new file mode 100644 index 00000000..149a8ff4 --- /dev/null +++ b/src/wixstdba/resource.h @@ -0,0 +1,15 @@ +// 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. + +#define IDC_STATIC -1 + + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/wixstdba/wixstdba.cpp b/src/wixstdba/wixstdba.cpp new file mode 100644 index 00000000..f47c1f4e --- /dev/null +++ b/src/wixstdba/wixstdba.cpp @@ -0,0 +1,78 @@ +// 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. + +#include "precomp.h" + +static HINSTANCE vhInstance = NULL; + +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID /* pvReserved */ + ) +{ + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + ::DisableThreadLibraryCalls(hInstance); + vhInstance = hInstance; + break; + + case DLL_PROCESS_DETACH: + vhInstance = NULL; + break; + } + + return TRUE; +} + + +extern "C" HRESULT WINAPI BootstrapperApplicationCreate( + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + IBootstrapperEngine* pEngine = NULL; + + hr = BalInitializeFromCreateArgs(pArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize Bal."); + + hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create bootstrapper application interface."); + +LExit: + ReleaseObject(pEngine); + + return hr; +} + + +extern "C" void WINAPI BootstrapperApplicationDestroy() +{ + BalUninitialize(); +} + + +extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + + BalInitialize(pEngine); + + hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create managed prerequisite bootstrapper application interface."); + +LExit: + return hr; +} + + +extern "C" void WINAPI MbaPrereqBootstrapperApplicationDestroy() +{ + BalUninitialize(); +} diff --git a/src/wixstdba/wixstdba.def b/src/wixstdba/wixstdba.def new file mode 100644 index 00000000..815d2977 --- /dev/null +++ b/src/wixstdba/wixstdba.def @@ -0,0 +1,8 @@ +; 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. + + +EXPORTS + BootstrapperApplicationCreate + BootstrapperApplicationDestroy + MbaPrereqBootstrapperApplicationCreate + MbaPrereqBootstrapperApplicationDestroy diff --git a/src/wixstdba/wixstdba.mc b/src/wixstdba/wixstdba.mc new file mode 100644 index 00000000..66aa9767 --- /dev/null +++ b/src/wixstdba/wixstdba.mc @@ -0,0 +1,73 @@ +; // 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. + + +MessageIdTypedef=DWORD + +LanguageNames=(English=0x409:MSG00409) + + +; // message definitions + +; // MessageId=# +; // Severity=Success +; // SymbolicName=MSG_SUCCESS +; // Language=English +; // Success %1. +; // . +; +; // MessageId=# +; // Severity=Warning +; // SymbolicName=MSG_WARNING +; // Language=English +; // Warning %1. +; // . +; +; // MessageId=# +; // Severity=Error +; // SymbolicName=MSG_ERROR +; // Language=English +; // Error %1. +; // . + +MessageId=1 +Severity=Success +SymbolicName=MSG_WIXSTDBA_DETECTED_FORWARD_COMPATIBLE_BUNDLE +Language=English +WIXSTDBA: Detected forward compatible bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! +. + +MessageId=2 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_PACKAGE +Language=English +WIXSTDBA: Planned package: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! +. + +MessageId=3 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE +Language=English +WIXSTDBA: Planned related bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! +. + +MessageId=4 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_COMPATIBLE_MSI_PACKAGE +Language=English +WIXSTDBA: Planned compatible package: %2!ls! for %1!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs! +. + +MessageId=5 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE +Language=English +WIXSTDBA: Planned target MSI package: %1!ls!, productCode: %2!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs! +. + +MessageId=6 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_MSI_FEATURE +Language=English +WIXSTDBA: Planned MSI feature: %2!ls! for %1!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs! +. + diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj new file mode 100644 index 00000000..ddc0bc57 --- /dev/null +++ b/src/wixstdba/wixstdba.vcxproj @@ -0,0 +1,106 @@ + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + + Debug + ARM + + + Release + ARM + + + + + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} + DynamicLibrary + Unicode + WixStdBA + wixstdba.def + + + + + + $(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc + comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;wixstdba.res + + + + + + + + + + + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + WixstdbaResources + + + Wixstdba%(RelativeDir) + + + + + + + Compiling message file... + mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z wixstdba.messages "$(InputDir)wixstdba.mc" +rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" + $(IntDir)wixstdba.messages.h;$(OutDir)wixstdba.messages.rc + + + + + -- cgit v1.2.3-55-g6feb From ea864b56d115e4f7a7205827ecaaba0e1db81d41 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 31 Dec 2018 23:57:35 -0600 Subject: Integrate into latest v4. --- .editorconfig | 37 ++ Bal.wixext.sln | 61 ++ appveyor.cmd | 13 + appveyor.yml | 40 ++ nuget.config | 18 + src/Cpp.Build.props | 100 ++++ src/Directory.Build.props | 26 + src/Directory.Build.targets | 48 ++ src/FindLocalWix.props | 8 + src/mbahost/host.cpp | 656 --------------------- src/mbahost/host.def | 6 - src/mbahost/host.vcxproj | 51 -- src/mbahost/mbahost.cpp | 656 +++++++++++++++++++++ src/mbahost/mbahost.def | 6 + src/mbahost/mbahost.vcxproj | 64 ++ src/mbahost/packages.config | 7 + src/mbahost/precomp.cpp | 3 + src/wixext/BalBinder.cs | 125 ---- src/wixext/BalCompiler.cs | 266 +++++---- src/wixext/BalErrors.cs | 55 ++ src/wixext/BalExtensionData.cs | 45 +- src/wixext/BalExtensionFactory.cs | 18 + src/wixext/BalWarnings.cs | 31 + .../BalWindowsInstallerBackendBinderExtension.cs | 146 +++++ src/wixext/Tuples/BalTupleDefinitions.cs | 55 ++ src/wixext/Tuples/WixBalBAFunctionsTuple.cs | 47 ++ src/wixext/Tuples/WixBalConditionTuple.cs | 55 ++ src/wixext/Tuples/WixMbaPrereqInformationTuple.cs | 63 ++ src/wixext/Tuples/WixStdbaOptionsTuple.cs | 79 +++ .../Tuples/WixStdbaOverridableVariableTuple.cs | 47 ++ src/wixext/WixBalExtension.csproj | 47 -- src/wixext/WixToolset.Bal.wixext.csproj | 30 + src/wixext/WixToolset.Bal.wixext.targets | 11 + src/wixext/messages.xml | 43 -- src/wixlib/BalExtension.wixproj | 39 -- src/wixlib/bal.wixproj | 62 ++ src/wixlib/packages.config | 5 + src/wixstdba/packages.config | 7 + src/wixstdba/precomp.cpp | 3 + src/wixstdba/precomp.h | 5 + src/wixstdba/wixstdba.vcxproj | 41 +- version.json | 11 + 42 files changed, 1987 insertions(+), 1149 deletions(-) create mode 100644 .editorconfig create mode 100644 Bal.wixext.sln create mode 100644 appveyor.cmd create mode 100644 appveyor.yml create mode 100644 nuget.config create mode 100644 src/Cpp.Build.props create mode 100644 src/Directory.Build.props create mode 100644 src/Directory.Build.targets create mode 100644 src/FindLocalWix.props delete mode 100644 src/mbahost/host.cpp delete mode 100644 src/mbahost/host.def delete mode 100644 src/mbahost/host.vcxproj create mode 100644 src/mbahost/mbahost.cpp create mode 100644 src/mbahost/mbahost.def create mode 100644 src/mbahost/mbahost.vcxproj create mode 100644 src/mbahost/packages.config create mode 100644 src/mbahost/precomp.cpp delete mode 100644 src/wixext/BalBinder.cs create mode 100644 src/wixext/BalErrors.cs create mode 100644 src/wixext/BalExtensionFactory.cs create mode 100644 src/wixext/BalWarnings.cs create mode 100644 src/wixext/BalWindowsInstallerBackendBinderExtension.cs create mode 100644 src/wixext/Tuples/BalTupleDefinitions.cs create mode 100644 src/wixext/Tuples/WixBalBAFunctionsTuple.cs create mode 100644 src/wixext/Tuples/WixBalConditionTuple.cs create mode 100644 src/wixext/Tuples/WixMbaPrereqInformationTuple.cs create mode 100644 src/wixext/Tuples/WixStdbaOptionsTuple.cs create mode 100644 src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs delete mode 100644 src/wixext/WixBalExtension.csproj create mode 100644 src/wixext/WixToolset.Bal.wixext.csproj create mode 100644 src/wixext/WixToolset.Bal.wixext.targets delete mode 100644 src/wixext/messages.xml delete mode 100644 src/wixlib/BalExtension.wixproj create mode 100644 src/wixlib/bal.wixproj create mode 100644 src/wixlib/packages.config create mode 100644 src/wixstdba/packages.config create mode 100644 src/wixstdba/precomp.cpp create mode 100644 version.json (limited to 'src') diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..1d72e683 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,37 @@ +# 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. +# +# Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig +# then update all of the repos. + +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.{cs,vb}] +dotnet_sort_system_directives_first = true + +[*.cs] +csharp_indent_case_contents = true : error +csharp_indent_switch_labels = true : error +csharp_new_line_before_open_brace = all +csharp_prefer_braces = true : error +csharp_style_expression_bodied_methods = when_on_single_line : suggestion +csharp_style_expression_bodied_constructors = when_on_single_line : suggestion +csharp_style_expression_bodied_operators = when_on_single_line : suggestion +csharp_style_expression_bodied_properties = when_on_single_line : suggestion +csharp_style_expression_bodied_indexers = when_on_single_line : suggestion +csharp_style_expression_bodied_accessors = when_on_single_line : suggestion +csharp_style_var_elsewhere = true : suggestion +csharp_style_var_for_built_in_types = true : suggestion +csharp_style_var_when_type_is_apparent = true : suggestion +dotnet_style_qualification_for_event = true : error +dotnet_style_qualification_for_field = true : error +dotnet_style_qualification_for_method = true : error +dotnet_style_qualification_for_property = true : error + +[*.targets] +indent_size = 2 diff --git a/Bal.wixext.sln b/Bal.wixext.sln new file mode 100644 index 00000000..8ec796c3 --- /dev/null +++ b/Bal.wixext.sln @@ -0,0 +1,61 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2016 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "src\mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "src\wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.Build.0 = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.ActiveCfg = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.Build.0 = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.ActiveCfg = Release|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.Build.0 = Release|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.ActiveCfg = Release|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.Build.0 = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.Build.0 = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.ActiveCfg = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.Build.0 = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.ActiveCfg = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.Build.0 = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.ActiveCfg = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.Build.0 = Release|Win32 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.ActiveCfg = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.Build.0 = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.ActiveCfg = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.Build.0 = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.ActiveCfg = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.Build.0 = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.ActiveCfg = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.Build.0 = Release|x86 + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.ActiveCfg = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.Build.0 = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.Build.0 = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.ActiveCfg = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {74046961-48BF-467A-A6C2-F886C75CE0BE} + EndGlobalSection +EndGlobal diff --git a/appveyor.cmd b/appveyor.cmd new file mode 100644 index 00000000..c75d03ea --- /dev/null +++ b/appveyor.cmd @@ -0,0 +1,13 @@ +@setlocal +@pushd %~dp0 + +nuget restore + +msbuild -p:Configuration=Release -t:Restore + +msbuild -p:Configuration=Release + +msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Bal.wixext.csproj + +@popd +@endlocal \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..c1df03cc --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,40 @@ +# 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. +# +# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml +# then update all of the repos. + +branches: + only: + - master + - develop + +image: Visual Studio 2017 + +version: 0.0.0.{build} +configuration: Release + +environment: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: 1 + NUGET_XMLDOC_MODE: skip + +build_script: + - appveyor.cmd + +pull_requests: + do_not_increment_build_number: true + +nuget: + disable_publish_on_pr: true + +skip_branch_with_pr: true +skip_tags: true + +artifacts: +- path: build\Release\**\*.nupkg + name: nuget + +notifications: +- provider: Slack + incoming_webhook: + secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/nuget.config b/nuget.config new file mode 100644 index 00000000..91504dac --- /dev/null +++ b/nuget.config @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props new file mode 100644 index 00000000..296b36ca --- /dev/null +++ b/src/Cpp.Build.props @@ -0,0 +1,100 @@ + + + + + + Win32 + $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ + $(OutputPath)$(Platform)\ + + + + + $(DisableSpecificCompilerWarnings) + Level4 + $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + Use + precomp.h + StdCall + true + false + -YlprecompDefine + /Zc:threadSafeInit- %(AdditionalOptions) + true + + + $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) + $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) + + + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) + + + $(ProjectSubSystem) + $(ProjectModuleDefinitionFile) + $(ResourceOnlyDll) + true + $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) + /IGNORE:4099 %(AdditionalOptions) + + + + + + NoExtensions + + + + + CDecl + + + + + OldStyle + true + true + + + + + Disabled + EnableFastChecks + _DEBUG;DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebug + + + + + + MultiThreadedDebugDll + + + + + MinSpace + NDEBUG;%(PreprocessorDefinitions) + true + true + MultiThreaded + + + true + true + + + + + + MultiThreadedDll + + + + + $(LinkKeyFile) + $(LinkDelaySign) + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 00000000..e853e22d --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,26 @@ + + + + + + Debug + false + + $(MSBuildProjectName) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) + $(BaseOutputPath)obj\$(ProjectName)\ + $(BaseOutputPath)$(Configuration)\ + + WiX Toolset Team + WiX Toolset + Copyright (c) .NET Foundation and contributors. All rights reserved. + MS-RL + WiX Toolset + + + + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets new file mode 100644 index 00000000..dac7452a --- /dev/null +++ b/src/Directory.Build.targets @@ -0,0 +1,48 @@ + + + + + + + true + $(SolutionPath) + $(NCrunchOriginalSolutionPath) + + + + + + + $([System.IO.File]::ReadAllText($(TheSolutionPath))) + $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) + (?<="[PackageName]", ")(.*)(?=", ") + + + + + + %(Identity) + $(SolutionFileContent.Contains('\%(Identity).csproj')) + + + + + $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) + $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) + + + + + + + + + + + diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props new file mode 100644 index 00000000..a784e352 --- /dev/null +++ b/src/FindLocalWix.props @@ -0,0 +1,8 @@ + + + + + + $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets + + diff --git a/src/mbahost/host.cpp b/src/mbahost/host.cpp deleted file mode 100644 index 694db357..00000000 --- a/src/mbahost/host.cpp +++ /dev/null @@ -1,656 +0,0 @@ -// 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. - -#include "precomp.h" -#include // includes the generated assembly name macros. -#include "BalBaseBootstrapperApplicationProc.h" - -static const DWORD NET452_RELEASE = 379893; - -using namespace mscorlib; - -extern "C" typedef HRESULT (WINAPI *PFN_CORBINDTOCURRENTRUNTIME)( - __in LPCWSTR pwszFileName, - __in REFCLSID rclsid, - __in REFIID riid, - __out LPVOID *ppv - ); - -extern "C" typedef HRESULT(WINAPI *PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE)( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ); - -static HINSTANCE vhInstance = NULL; -static ICorRuntimeHost *vpCLRHost = NULL; -static _AppDomain *vpAppDomain = NULL; -static HMODULE vhMbapreqModule = NULL; - - -// internal function declarations - -static HRESULT GetAppDomain( - __out _AppDomain** ppAppDomain - ); -static HRESULT GetAppBase( - __out LPWSTR* psczAppBase - ); -static HRESULT CheckSupportedFrameworks( - __in LPCWSTR wzConfigPath - ); -static HRESULT UpdateSupportedRuntime( - __in IXMLDOMDocument* pixdManifest, - __in IXMLDOMNode* pixnSupportedFramework, - __out BOOL* pfUpdatedManifest - ); -static HRESULT GetCLRHost( - __in LPCWSTR wzConfigPath, - __out ICorRuntimeHost** ppCLRHost - ); -static HRESULT CreateManagedBootstrapperApplication( - __in _AppDomain* pAppDomain, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ); -static HRESULT CreateManagedBootstrapperApplicationFactory( - __in _AppDomain* pAppDomain, - __out IBootstrapperApplicationFactory** ppAppFactory - ); -static HRESULT CreatePrerequisiteBA( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ); -static HRESULT VerifyNET4RuntimeIsSupported( - ); - - -// function definitions - -extern "C" BOOL WINAPI DllMain( - IN HINSTANCE hInstance, - IN DWORD dwReason, - IN LPVOID /* pvReserved */ - ) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - ::DisableThreadLibraryCalls(hInstance); - vhInstance = hInstance; - break; - - case DLL_PROCESS_DETACH: - vhInstance = NULL; - break; - } - - return TRUE; -} - -// Note: This function assumes that COM was already initialized on the thread. -extern "C" HRESULT WINAPI BootstrapperApplicationCreate( - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - HRESULT hrHostInitialization = S_OK; - IBootstrapperEngine* pEngine = NULL; - - hr = BalInitializeFromCreateArgs(pArgs, &pEngine); - ExitOnFailure(hr, "Failed to initialize Bal."); - - hr = GetAppDomain(&vpAppDomain); - if (SUCCEEDED(hr)) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading managed bootstrapper application."); - - hr = CreateManagedBootstrapperApplication(vpAppDomain, pEngine, pArgs, pResults); - BalExitOnFailure(hr, "Failed to create the managed bootstrapper application."); - } - else // fallback to the prerequisite BA. - { - if (E_MBAHOST_NET452_ON_WIN7RTM == hr) - { - BalLogError(hr, "The Burn engine cannot run with an MBA under the .NET 4 CLR on Windows 7 RTM with .NET 4.5.2 (or greater) installed."); - hrHostInitialization = hr; - } - else - { - hrHostInitialization = S_OK; - } - - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because managed host could not be loaded, error: 0x%08x.", hr); - - hr = CreatePrerequisiteBA(hrHostInitialization, pEngine, pArgs, pResults); - BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application."); - } - -LExit: - return hr; -} - -extern "C" void WINAPI BootstrapperApplicationDestroy() -{ - if (vpAppDomain) - { - HRESULT hr = vpCLRHost->UnloadDomain(vpAppDomain); - if (FAILED(hr)) - { - BalLogError(hr, "Failed to unload app domain."); - } - - vpAppDomain->Release(); - } - - if (vpCLRHost) - { - vpCLRHost->Stop(); - vpCLRHost->Release(); - } - - if (vhMbapreqModule) - { - PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast(::GetProcAddress(vhMbapreqModule, "MbaPrereqBootstrapperApplicationDestroy")); - if (pfnDestroy) - { - (*pfnDestroy)(); - } - - ::FreeLibrary(vhMbapreqModule); - vhMbapreqModule = NULL; - } - - BalUninitialize(); -} - -// Gets the custom AppDomain for loading managed BA. -static HRESULT GetAppDomain( - __out _AppDomain **ppAppDomain - ) -{ - HRESULT hr = S_OK; - ICorRuntimeHost *pCLRHost = NULL; - IUnknown *pUnk = NULL; - LPWSTR sczAppBase = NULL; - LPWSTR sczConfigPath = NULL; - IAppDomainSetup *pAppDomainSetup; - BSTR bstrAppBase = NULL; - BSTR bstrConfigPath = NULL; - - hr = GetAppBase(&sczAppBase); - ExitOnFailure(hr, "Failed to get the host base path."); - - hr = PathConcat(sczAppBase, L"BootstrapperCore.config", &sczConfigPath); - ExitOnFailure(hr, "Failed to get the full path to the application configuration file."); - - // Check that the supported framework is installed. - hr = CheckSupportedFrameworks(sczConfigPath); - ExitOnFailure(hr, "Failed to find supported framework."); - - // Load the CLR. - hr = GetCLRHost(sczConfigPath, &pCLRHost); - ExitOnFailure(hr, "Failed to create the CLR host."); - - hr = pCLRHost->Start(); - ExitOnRootFailure(hr, "Failed to start the CLR host."); - - // Create the setup information for a new AppDomain to set the app base and config. - hr = pCLRHost->CreateDomainSetup(&pUnk); - ExitOnRootFailure(hr, "Failed to create the AppDomainSetup object."); - - hr = pUnk->QueryInterface(__uuidof(IAppDomainSetup), reinterpret_cast(&pAppDomainSetup)); - ExitOnRootFailure(hr, "Failed to query for the IAppDomainSetup interface."); - ReleaseNullObject(pUnk); - - // Set properties on the AppDomainSetup object. - bstrAppBase = ::SysAllocString(sczAppBase); - ExitOnNull(bstrAppBase, hr, E_OUTOFMEMORY, "Failed to allocate the application base path for the AppDomainSetup."); - - hr = pAppDomainSetup->put_ApplicationBase(bstrAppBase); - ExitOnRootFailure(hr, "Failed to set the application base path for the AppDomainSetup."); - - bstrConfigPath = ::SysAllocString(sczConfigPath); - ExitOnNull(bstrConfigPath, hr, E_OUTOFMEMORY, "Failed to allocate the application configuration file for the AppDomainSetup."); - - hr = pAppDomainSetup->put_ConfigurationFile(bstrConfigPath); - ExitOnRootFailure(hr, "Failed to set the configuration file path for the AppDomainSetup."); - - // Create the AppDomain to load the factory type. - hr = pCLRHost->CreateDomainEx(L"MBA", pAppDomainSetup, NULL, &pUnk); - ExitOnRootFailure(hr, "Failed to create the MBA AppDomain."); - - hr = pUnk->QueryInterface(__uuidof(_AppDomain), reinterpret_cast(ppAppDomain)); - ExitOnRootFailure(hr, "Failed to query for the _AppDomain interface."); - -LExit: - ReleaseBSTR(bstrConfigPath); - ReleaseBSTR(bstrAppBase); - ReleaseStr(sczConfigPath); - ReleaseStr(sczAppBase); - ReleaseNullObject(pUnk); - ReleaseNullObject(pCLRHost); - - return hr; -} - -static HRESULT GetAppBase( - __out LPWSTR *psczAppBase - ) -{ - HRESULT hr = S_OK; - LPWSTR sczFullPath = NULL; - - hr = PathForCurrentProcess(&sczFullPath, vhInstance); - ExitOnFailure(hr, "Failed to get the full host path."); - - hr = PathGetDirectory(sczFullPath, psczAppBase); - ExitOnFailure(hr, "Failed to get the directory of the full process path."); - -LExit: - ReleaseStr(sczFullPath); - - return hr; -} - -// Checks whether at least one of required supported frameworks is installed via the NETFX registry keys. -static HRESULT CheckSupportedFrameworks( - __in LPCWSTR wzConfigPath - ) -{ - HRESULT hr = S_OK; - IXMLDOMDocument* pixdManifest = NULL; - IXMLDOMNodeList* pNodeList = NULL; - IXMLDOMNode* pNode = NULL; - DWORD cSupportedFrameworks = 0; - LPWSTR sczSupportedFrameworkVersion = NULL; - LPWSTR sczFrameworkRegistryKey = NULL; - HKEY hkFramework = NULL; - DWORD dwFrameworkInstalled = 0; - BOOL fUpdatedManifest = FALSE; - - hr = XmlInitialize(); - ExitOnFailure(hr, "Failed to initialize XML."); - - hr = XmlLoadDocumentFromFile(wzConfigPath, &pixdManifest); - ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); - - hr = XmlSelectNodes(pixdManifest, L"/configuration/wix.bootstrapper/host/supportedFramework", &pNodeList); - ExitOnFailure(hr, "Failed to select all supportedFramework elements."); - - hr = pNodeList->get_length(reinterpret_cast(&cSupportedFrameworks)); - ExitOnFailure(hr, "Failed to get the supported framework count."); - - if (cSupportedFrameworks) - { - while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL))) - { - hr = XmlGetAttributeEx(pNode, L"version", &sczSupportedFrameworkVersion); - ExitOnFailure(hr, "Failed to get supportedFramework/@version."); - - hr = StrAllocFormatted(&sczFrameworkRegistryKey, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\%ls", sczSupportedFrameworkVersion); - ExitOnFailure(hr, "Failed to allocate path to supported framework Install registry key."); - - hr = RegOpen(HKEY_LOCAL_MACHINE, sczFrameworkRegistryKey, KEY_READ, &hkFramework); - if (SUCCEEDED(hr)) - { - hr = RegReadNumber(hkFramework, L"Install", &dwFrameworkInstalled); - if (dwFrameworkInstalled) - { - hr = S_OK; - break; - } - } - - ReleaseNullObject(pNode); - } - - // If we looped through all the supported frameworks but didn't find anything, ensure we return a failure. - if (S_FALSE == hr) - { - hr = E_NOTFOUND; - ExitOnRootFailure(hr, "Failed to find a supported framework."); - } - - hr = UpdateSupportedRuntime(pixdManifest, pNode, &fUpdatedManifest); - ExitOnFailure(hr, "Failed to update supportedRuntime."); - } - // else no supported frameworks specified, so the startup/supportedRuntime must be enough. - - if (fUpdatedManifest) - { - hr = XmlSaveDocument(pixdManifest, wzConfigPath); - ExitOnFailure(hr, "Failed to save updated manifest over config file: %ls", wzConfigPath); - } - -LExit: - ReleaseRegKey(hkFramework); - ReleaseStr(sczFrameworkRegistryKey); - ReleaseStr(sczSupportedFrameworkVersion); - ReleaseObject(pNode); - ReleaseObject(pNodeList); - ReleaseObject(pixdManifest); - - XmlUninitialize(); - - return hr; -} - -// Fixes the supportedRuntime element if necessary. -static HRESULT UpdateSupportedRuntime( - __in IXMLDOMDocument* pixdManifest, - __in IXMLDOMNode* pixnSupportedFramework, - __out BOOL* pfUpdatedManifest - ) -{ - HRESULT hr = S_OK; - LPWSTR sczSupportedRuntimeVersion = NULL; - IXMLDOMNode* pixnStartup = NULL; - IXMLDOMNode* pixnSupportedRuntime = NULL; - - *pfUpdatedManifest = FALSE; - - // If the runtime version attribute is not specified, don't update the manifest. - hr = XmlGetAttributeEx(pixnSupportedFramework, L"runtimeVersion", &sczSupportedRuntimeVersion); - if (E_NOTFOUND == hr) - { - ExitFunction1(hr = S_OK); - } - ExitOnFailure(hr, "Failed to get supportedFramework/@runtimeVersion."); - - // Get the startup element. Fail if we can't find it since it'll be necessary to load the - // correct runtime. - hr = XmlSelectSingleNode(pixdManifest, L"/configuration/startup", &pixnStartup); - ExitOnFailure(hr, "Failed to get startup element."); - - if (S_FALSE == hr) - { - hr = E_NOTFOUND; - ExitOnRootFailure(hr, "Failed to find startup element in bootstrapper application config."); - } - - // Remove any pre-existing supported runtimes because they'll just get in the way and create our new one. - hr = XmlRemoveChildren(pixnStartup, L"supportedRuntime"); - ExitOnFailure(hr, "Failed to remove pre-existing supportedRuntime elements."); - - hr = XmlCreateChild(pixnStartup, L"supportedRuntime", &pixnSupportedRuntime); - ExitOnFailure(hr, "Failed to create supportedRuntime element."); - - hr = XmlSetAttribute(pixnSupportedRuntime, L"version", sczSupportedRuntimeVersion); - ExitOnFailure(hr, "Failed to set supportedRuntime/@version to '%ls'.", sczSupportedRuntimeVersion); - - *pfUpdatedManifest = TRUE; - -LExit: - ReleaseObject(pixnSupportedRuntime); - ReleaseObject(pixnStartup); - ReleaseStr(sczSupportedRuntimeVersion); - - return hr; -} - -// Gets the CLR host and caches it. -static HRESULT GetCLRHost( - __in LPCWSTR wzConfigPath, - __out ICorRuntimeHost **ppCLRHost - ) -{ - HRESULT hr = S_OK; - UINT uiMode = 0; - HMODULE hModule = NULL; - BOOL fFallbackToCorBindToCurrentRuntime = TRUE; - CLRCreateInstanceFnPtr pfnCLRCreateInstance = NULL; - ICLRMetaHostPolicy* pCLRMetaHostPolicy = NULL; - IStream* pCfgStream = NULL; - LPWSTR pwzVersion = NULL; - DWORD cchVersion = 0; - DWORD dwConfigFlags = 0; - ICLRRuntimeInfo* pCLRRuntimeInfo = NULL; - PFN_CORBINDTOCURRENTRUNTIME pfnCorBindToCurrentRuntime = NULL; - - // Always set the error mode because we will always restore it below. - uiMode = ::SetErrorMode(0); - - // Cache the CLR host to be shutdown later. This can occur on a different thread. - if (!vpCLRHost) - { - // Disable message boxes from being displayed on error and blocking execution. - ::SetErrorMode(uiMode | SEM_FAILCRITICALERRORS); - - hr = LoadSystemLibrary(L"mscoree.dll", &hModule); - ExitOnFailure(hr, "Failed to load mscoree.dll"); - - pfnCLRCreateInstance = reinterpret_cast(::GetProcAddress(hModule, "CLRCreateInstance")); - - if (pfnCLRCreateInstance) - { - hr = pfnCLRCreateInstance(CLSID_CLRMetaHostPolicy, IID_ICLRMetaHostPolicy, reinterpret_cast(&pCLRMetaHostPolicy)); - if (E_NOTIMPL != hr) - { - ExitOnRootFailure(hr, "Failed to create instance of ICLRMetaHostPolicy."); - - fFallbackToCorBindToCurrentRuntime = FALSE; - } - } - - if (fFallbackToCorBindToCurrentRuntime) - { - pfnCorBindToCurrentRuntime = reinterpret_cast(::GetProcAddress(hModule, "CorBindToCurrentRuntime")); - ExitOnNullWithLastError(pfnCorBindToCurrentRuntime, hr, "Failed to get procedure address for CorBindToCurrentRuntime."); - - hr = pfnCorBindToCurrentRuntime(wzConfigPath, CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); - ExitOnRootFailure(hr, "Failed to create the CLR host using the application configuration file path."); - } - else - { - - hr = SHCreateStreamOnFileEx(wzConfigPath, STGM_READ | STGM_SHARE_DENY_WRITE, 0, FALSE, NULL, &pCfgStream); - ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); - - hr = pCLRMetaHostPolicy->GetRequestedRuntime(METAHOST_POLICY_HIGHCOMPAT, NULL, pCfgStream, NULL, &cchVersion, NULL, NULL, &dwConfigFlags, IID_ICLRRuntimeInfo, reinterpret_cast(&pCLRRuntimeInfo)); - ExitOnRootFailure(hr, "Failed to get the CLR runtime info using the application configuration file path."); - - // .NET 4 RTM had a bug where it wouldn't set pcchVersion if pwzVersion was NULL. - if (!cchVersion) - { - hr = pCLRRuntimeInfo->GetVersionString(NULL, &cchVersion); - if (HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) != hr) - { - ExitOnFailure(hr, "Failed to get the length of the CLR version string."); - } - } - - hr = StrAlloc(&pwzVersion, cchVersion); - ExitOnFailure(hr, "Failed to allocate the CLR version string."); - - hr = pCLRRuntimeInfo->GetVersionString(pwzVersion, &cchVersion); - ExitOnFailure(hr, "Failed to get the CLR version string."); - - if (CSTR_EQUAL == CompareString(LOCALE_NEUTRAL, 0, L"v4.0.30319", -1, pwzVersion, cchVersion)) - { - hr = VerifyNET4RuntimeIsSupported(); - ExitOnFailure(hr, "Found unsupported .NET 4 Runtime."); - } - - if (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_TRUE == (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_MASK & dwConfigFlags)) - { - hr = pCLRRuntimeInfo->BindAsLegacyV2Runtime(); - ExitOnRootFailure(hr, "Failed to bind as legacy V2 runtime."); - } - - hr = pCLRRuntimeInfo->GetInterface(CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); - ExitOnRootFailure(hr, "Failed to get instance of ICorRuntimeHost."); - - // TODO: use ICLRRuntimeHost instead of ICorRuntimeHost on .NET 4 since the former is faster and the latter is deprecated - //hr = pCLRRuntimeInfo->GetInterface(CLSID_CLRRuntimeHost, IID_ICLRRuntimeHost, reinterpret_cast(&pCLRRuntimeHost)); - //ExitOnRootFailure(hr, "Failed to get instance of ICLRRuntimeHost."); - } - } - - vpCLRHost->AddRef(); - *ppCLRHost = vpCLRHost; - -LExit: - ReleaseStr(pwzVersion); - ReleaseNullObject(pCLRRuntimeInfo); - ReleaseNullObject(pCfgStream); - ReleaseNullObject(pCLRMetaHostPolicy); - - // Unload the module so it's not in use when we install .NET. - if (FAILED(hr)) - { - ::FreeLibrary(hModule); - } - - ::SetErrorMode(uiMode); // restore the previous error mode. - - return hr; -} - -// Creates the bootstrapper app and returns it for the engine. -static HRESULT CreateManagedBootstrapperApplication( - __in _AppDomain* pAppDomain, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - IBootstrapperApplicationFactory* pAppFactory = NULL; - IBootstrapperApplication* pApp = NULL; - - hr = CreateManagedBootstrapperApplicationFactory(pAppDomain, &pAppFactory); - ExitOnFailure(hr, "Failed to create the factory to create the bootstrapper application."); - - hr = pAppFactory->Create(pEngine, pArgs->pCommand, &pApp); - ExitOnFailure(hr, "Failed to create the bootstrapper application."); - - pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; - pResults->pvBootstrapperApplicationProcContext = pApp; - pApp = NULL; - -LExit: - ReleaseNullObject(pApp); - ReleaseNullObject(pAppFactory); - - return hr; -} - -// Creates the app factory to create the managed app in the default AppDomain. -static HRESULT CreateManagedBootstrapperApplicationFactory( - __in _AppDomain* pAppDomain, - __out IBootstrapperApplicationFactory** ppAppFactory - ) -{ - HRESULT hr = S_OK; - BSTR bstrAssemblyName = NULL; - BSTR bstrTypeName = NULL; - _ObjectHandle* pObj = NULL; - VARIANT vtBAFactory; - - ::VariantInit(&vtBAFactory); - - bstrAssemblyName = ::SysAllocString(MUX_ASSEMBLY_FULL_NAME); - ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory."); - - bstrTypeName = ::SysAllocString(L"WixToolset.Bootstrapper.BootstrapperApplicationFactory"); - ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory."); - - hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj); - ExitOnRootFailure(hr, "Failed to create the BA factory object."); - - hr = pObj->Unwrap(&vtBAFactory); - ExitOnRootFailure(hr, "Failed to unwrap the BA factory object into the host domain."); - ExitOnNull(vtBAFactory.punkVal, hr, E_UNEXPECTED, "The variant did not contain the expected IUnknown pointer."); - - hr = vtBAFactory.punkVal->QueryInterface(__uuidof(IBootstrapperApplicationFactory), reinterpret_cast(ppAppFactory)); - ExitOnRootFailure(hr, "Failed to query for the bootstrapper app factory interface."); - -LExit: - ReleaseVariant(vtBAFactory); - ReleaseNullObject(pObj); - ReleaseBSTR(bstrTypeName); - ReleaseBSTR(bstrAssemblyName); - - return hr; -} - -static HRESULT CreatePrerequisiteBA( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - LPWSTR sczMbapreqPath = NULL; - HMODULE hModule = NULL; - - hr = PathRelativeToModule(&sczMbapreqPath, L"mbapreq.dll", vhInstance); - ExitOnFailure(hr, "Failed to get path to pre-requisite BA."); - - hModule = ::LoadLibraryW(sczMbapreqPath); - ExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL."); - - PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast(::GetProcAddress(hModule, "MbaPrereqBootstrapperApplicationCreate")); - ExitOnNullWithLastError(pfnCreate, hr, "Failed to get MbaPrereqBootstrapperApplicationCreate entry-point from: %ls", sczMbapreqPath); - - hr = pfnCreate(hrHostInitialization, pEngine, pArgs, pResults); - ExitOnFailure(hr, "Failed to create prequisite bootstrapper app."); - - vhMbapreqModule = hModule; - hModule = NULL; - -LExit: - if (hModule) - { - ::FreeLibrary(hModule); - } - ReleaseStr(sczMbapreqPath); - - return hr; -} - -static HRESULT VerifyNET4RuntimeIsSupported( - ) -{ - HRESULT hr = S_OK; - OS_VERSION osv = OS_VERSION_UNKNOWN; - DWORD dwServicePack = 0; - HKEY hKey = NULL; - DWORD er = ERROR_SUCCESS; - DWORD dwRelease = 0; - DWORD cchRelease = sizeof(dwRelease); - - OsGetVersion(&osv, &dwServicePack); - if (OS_VERSION_WIN7 == osv && 0 == dwServicePack) - { - hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", KEY_QUERY_VALUE, &hKey); - if (E_FILENOTFOUND == hr) - { - ExitFunction1(hr = S_OK); - } - ExitOnFailure(hr, "Failed to open registry key for .NET 4."); - - er = ::RegQueryValueExW(hKey, L"Release", NULL, NULL, reinterpret_cast(&dwRelease), &cchRelease); - if (ERROR_FILE_NOT_FOUND == er) - { - ExitFunction1(hr = S_OK); - } - ExitOnWin32Error(er, hr, "Failed to get Release value."); - - if (NET452_RELEASE <= dwRelease) - { - hr = E_MBAHOST_NET452_ON_WIN7RTM; - } - } - -LExit: - ReleaseRegKey(hKey); - - return hr; -} diff --git a/src/mbahost/host.def b/src/mbahost/host.def deleted file mode 100644 index 4488df94..00000000 --- a/src/mbahost/host.def +++ /dev/null @@ -1,6 +0,0 @@ -; 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. - - -EXPORTS - BootstrapperApplicationCreate - BootstrapperApplicationDestroy diff --git a/src/mbahost/host.vcxproj b/src/mbahost/host.vcxproj deleted file mode 100644 index a4c3ea16..00000000 --- a/src/mbahost/host.vcxproj +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - Debug - Win32 - - - Release - Win32 - - - - - {12C87C77-3547-44F8-8134-29BC915CB19D} - DynamicLibrary - Unicode - mbahost - host.def - - - - - - $(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc;$(BaseIntermediateOutputPath)\core - dutil.lib;balutil.lib;shlwapi.lib - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/mbahost/mbahost.cpp b/src/mbahost/mbahost.cpp new file mode 100644 index 00000000..d3737c06 --- /dev/null +++ b/src/mbahost/mbahost.cpp @@ -0,0 +1,656 @@ +// 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. + +#include "precomp.h" +#include // includes the generated assembly name macros. +#include "BalBaseBootstrapperApplicationProc.h" + +static const DWORD NET452_RELEASE = 379893; + +using namespace mscorlib; + +extern "C" typedef HRESULT (WINAPI *PFN_CORBINDTOCURRENTRUNTIME)( + __in LPCWSTR pwszFileName, + __in REFCLSID rclsid, + __in REFIID riid, + __out LPVOID *ppv + ); + +extern "C" typedef HRESULT(WINAPI *PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE)( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); + +static HINSTANCE vhInstance = NULL; +static ICorRuntimeHost *vpCLRHost = NULL; +static _AppDomain *vpAppDomain = NULL; +static HMODULE vhMbapreqModule = NULL; + + +// internal function declarations + +static HRESULT GetAppDomain( + __out _AppDomain** ppAppDomain + ); +static HRESULT GetAppBase( + __out LPWSTR* psczAppBase + ); +static HRESULT CheckSupportedFrameworks( + __in LPCWSTR wzConfigPath + ); +static HRESULT UpdateSupportedRuntime( + __in IXMLDOMDocument* pixdManifest, + __in IXMLDOMNode* pixnSupportedFramework, + __out BOOL* pfUpdatedManifest + ); +static HRESULT GetCLRHost( + __in LPCWSTR wzConfigPath, + __out ICorRuntimeHost** ppCLRHost + ); +static HRESULT CreateManagedBootstrapperApplication( + __in _AppDomain* pAppDomain, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); +static HRESULT CreateManagedBootstrapperApplicationFactory( + __in _AppDomain* pAppDomain, + __out IBootstrapperApplicationFactory** ppAppFactory + ); +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); +static HRESULT VerifyNET4RuntimeIsSupported( + ); + + +// function definitions + +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID /* pvReserved */ + ) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + ::DisableThreadLibraryCalls(hInstance); + vhInstance = hInstance; + break; + + case DLL_PROCESS_DETACH: + vhInstance = NULL; + break; + } + + return TRUE; +} + +// Note: This function assumes that COM was already initialized on the thread. +extern "C" HRESULT WINAPI BootstrapperApplicationCreate( + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + HRESULT hrHostInitialization = S_OK; + IBootstrapperEngine* pEngine = NULL; + + hr = BalInitializeFromCreateArgs(pArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize Bal."); + + hr = GetAppDomain(&vpAppDomain); + if (SUCCEEDED(hr)) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading managed bootstrapper application."); + + hr = CreateManagedBootstrapperApplication(vpAppDomain, pEngine, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the managed bootstrapper application."); + } + else // fallback to the prerequisite BA. + { + if (E_MBAHOST_NET452_ON_WIN7RTM == hr) + { + BalLogError(hr, "The Burn engine cannot run with an MBA under the .NET 4 CLR on Windows 7 RTM with .NET 4.5.2 (or greater) installed."); + hrHostInitialization = hr; + } + else + { + hrHostInitialization = S_OK; + } + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because managed host could not be loaded, error: 0x%08x.", hr); + + hr = CreatePrerequisiteBA(hrHostInitialization, pEngine, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application."); + } + +LExit: + return hr; +} + +extern "C" void WINAPI BootstrapperApplicationDestroy() +{ + if (vpAppDomain) + { + HRESULT hr = vpCLRHost->UnloadDomain(vpAppDomain); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to unload app domain."); + } + + vpAppDomain->Release(); + } + + if (vpCLRHost) + { + vpCLRHost->Stop(); + vpCLRHost->Release(); + } + + if (vhMbapreqModule) + { + PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast(::GetProcAddress(vhMbapreqModule, "MbaPrereqBootstrapperApplicationDestroy")); + if (pfnDestroy) + { + (*pfnDestroy)(); + } + + ::FreeLibrary(vhMbapreqModule); + vhMbapreqModule = NULL; + } + + BalUninitialize(); +} + +// Gets the custom AppDomain for loading managed BA. +static HRESULT GetAppDomain( + __out _AppDomain **ppAppDomain + ) +{ + HRESULT hr = S_OK; + ICorRuntimeHost *pCLRHost = NULL; + IUnknown *pUnk = NULL; + LPWSTR sczAppBase = NULL; + LPWSTR sczConfigPath = NULL; + IAppDomainSetup *pAppDomainSetup; + BSTR bstrAppBase = NULL; + BSTR bstrConfigPath = NULL; + + hr = GetAppBase(&sczAppBase); + ExitOnFailure(hr, "Failed to get the host base path."); + + hr = PathConcat(sczAppBase, L"WixToolset.BootstrapperCore.config", &sczConfigPath); + ExitOnFailure(hr, "Failed to get the full path to the application configuration file."); + + // Check that the supported framework is installed. + hr = CheckSupportedFrameworks(sczConfigPath); + ExitOnFailure(hr, "Failed to find supported framework."); + + // Load the CLR. + hr = GetCLRHost(sczConfigPath, &pCLRHost); + ExitOnFailure(hr, "Failed to create the CLR host."); + + hr = pCLRHost->Start(); + ExitOnRootFailure(hr, "Failed to start the CLR host."); + + // Create the setup information for a new AppDomain to set the app base and config. + hr = pCLRHost->CreateDomainSetup(&pUnk); + ExitOnRootFailure(hr, "Failed to create the AppDomainSetup object."); + + hr = pUnk->QueryInterface(__uuidof(IAppDomainSetup), reinterpret_cast(&pAppDomainSetup)); + ExitOnRootFailure(hr, "Failed to query for the IAppDomainSetup interface."); + ReleaseNullObject(pUnk); + + // Set properties on the AppDomainSetup object. + bstrAppBase = ::SysAllocString(sczAppBase); + ExitOnNull(bstrAppBase, hr, E_OUTOFMEMORY, "Failed to allocate the application base path for the AppDomainSetup."); + + hr = pAppDomainSetup->put_ApplicationBase(bstrAppBase); + ExitOnRootFailure(hr, "Failed to set the application base path for the AppDomainSetup."); + + bstrConfigPath = ::SysAllocString(sczConfigPath); + ExitOnNull(bstrConfigPath, hr, E_OUTOFMEMORY, "Failed to allocate the application configuration file for the AppDomainSetup."); + + hr = pAppDomainSetup->put_ConfigurationFile(bstrConfigPath); + ExitOnRootFailure(hr, "Failed to set the configuration file path for the AppDomainSetup."); + + // Create the AppDomain to load the factory type. + hr = pCLRHost->CreateDomainEx(L"MBA", pAppDomainSetup, NULL, &pUnk); + ExitOnRootFailure(hr, "Failed to create the MBA AppDomain."); + + hr = pUnk->QueryInterface(__uuidof(_AppDomain), reinterpret_cast(ppAppDomain)); + ExitOnRootFailure(hr, "Failed to query for the _AppDomain interface."); + +LExit: + ReleaseBSTR(bstrConfigPath); + ReleaseBSTR(bstrAppBase); + ReleaseStr(sczConfigPath); + ReleaseStr(sczAppBase); + ReleaseNullObject(pUnk); + ReleaseNullObject(pCLRHost); + + return hr; +} + +static HRESULT GetAppBase( + __out LPWSTR *psczAppBase + ) +{ + HRESULT hr = S_OK; + LPWSTR sczFullPath = NULL; + + hr = PathForCurrentProcess(&sczFullPath, vhInstance); + ExitOnFailure(hr, "Failed to get the full host path."); + + hr = PathGetDirectory(sczFullPath, psczAppBase); + ExitOnFailure(hr, "Failed to get the directory of the full process path."); + +LExit: + ReleaseStr(sczFullPath); + + return hr; +} + +// Checks whether at least one of required supported frameworks is installed via the NETFX registry keys. +static HRESULT CheckSupportedFrameworks( + __in LPCWSTR wzConfigPath + ) +{ + HRESULT hr = S_OK; + IXMLDOMDocument* pixdManifest = NULL; + IXMLDOMNodeList* pNodeList = NULL; + IXMLDOMNode* pNode = NULL; + DWORD cSupportedFrameworks = 0; + LPWSTR sczSupportedFrameworkVersion = NULL; + LPWSTR sczFrameworkRegistryKey = NULL; + HKEY hkFramework = NULL; + DWORD dwFrameworkInstalled = 0; + BOOL fUpdatedManifest = FALSE; + + hr = XmlInitialize(); + ExitOnFailure(hr, "Failed to initialize XML."); + + hr = XmlLoadDocumentFromFile(wzConfigPath, &pixdManifest); + ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); + + hr = XmlSelectNodes(pixdManifest, L"/configuration/wix.bootstrapper/host/supportedFramework", &pNodeList); + ExitOnFailure(hr, "Failed to select all supportedFramework elements."); + + hr = pNodeList->get_length(reinterpret_cast(&cSupportedFrameworks)); + ExitOnFailure(hr, "Failed to get the supported framework count."); + + if (cSupportedFrameworks) + { + while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL))) + { + hr = XmlGetAttributeEx(pNode, L"version", &sczSupportedFrameworkVersion); + ExitOnFailure(hr, "Failed to get supportedFramework/@version."); + + hr = StrAllocFormatted(&sczFrameworkRegistryKey, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\%ls", sczSupportedFrameworkVersion); + ExitOnFailure(hr, "Failed to allocate path to supported framework Install registry key."); + + hr = RegOpen(HKEY_LOCAL_MACHINE, sczFrameworkRegistryKey, KEY_READ, &hkFramework); + if (SUCCEEDED(hr)) + { + hr = RegReadNumber(hkFramework, L"Install", &dwFrameworkInstalled); + if (dwFrameworkInstalled) + { + hr = S_OK; + break; + } + } + + ReleaseNullObject(pNode); + } + + // If we looped through all the supported frameworks but didn't find anything, ensure we return a failure. + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + ExitOnRootFailure(hr, "Failed to find a supported framework."); + } + + hr = UpdateSupportedRuntime(pixdManifest, pNode, &fUpdatedManifest); + ExitOnFailure(hr, "Failed to update supportedRuntime."); + } + // else no supported frameworks specified, so the startup/supportedRuntime must be enough. + + if (fUpdatedManifest) + { + hr = XmlSaveDocument(pixdManifest, wzConfigPath); + ExitOnFailure(hr, "Failed to save updated manifest over config file: %ls", wzConfigPath); + } + +LExit: + ReleaseRegKey(hkFramework); + ReleaseStr(sczFrameworkRegistryKey); + ReleaseStr(sczSupportedFrameworkVersion); + ReleaseObject(pNode); + ReleaseObject(pNodeList); + ReleaseObject(pixdManifest); + + XmlUninitialize(); + + return hr; +} + +// Fixes the supportedRuntime element if necessary. +static HRESULT UpdateSupportedRuntime( + __in IXMLDOMDocument* pixdManifest, + __in IXMLDOMNode* pixnSupportedFramework, + __out BOOL* pfUpdatedManifest + ) +{ + HRESULT hr = S_OK; + LPWSTR sczSupportedRuntimeVersion = NULL; + IXMLDOMNode* pixnStartup = NULL; + IXMLDOMNode* pixnSupportedRuntime = NULL; + + *pfUpdatedManifest = FALSE; + + // If the runtime version attribute is not specified, don't update the manifest. + hr = XmlGetAttributeEx(pixnSupportedFramework, L"runtimeVersion", &sczSupportedRuntimeVersion); + if (E_NOTFOUND == hr) + { + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to get supportedFramework/@runtimeVersion."); + + // Get the startup element. Fail if we can't find it since it'll be necessary to load the + // correct runtime. + hr = XmlSelectSingleNode(pixdManifest, L"/configuration/startup", &pixnStartup); + ExitOnFailure(hr, "Failed to get startup element."); + + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + ExitOnRootFailure(hr, "Failed to find startup element in bootstrapper application config."); + } + + // Remove any pre-existing supported runtimes because they'll just get in the way and create our new one. + hr = XmlRemoveChildren(pixnStartup, L"supportedRuntime"); + ExitOnFailure(hr, "Failed to remove pre-existing supportedRuntime elements."); + + hr = XmlCreateChild(pixnStartup, L"supportedRuntime", &pixnSupportedRuntime); + ExitOnFailure(hr, "Failed to create supportedRuntime element."); + + hr = XmlSetAttribute(pixnSupportedRuntime, L"version", sczSupportedRuntimeVersion); + ExitOnFailure(hr, "Failed to set supportedRuntime/@version to '%ls'.", sczSupportedRuntimeVersion); + + *pfUpdatedManifest = TRUE; + +LExit: + ReleaseObject(pixnSupportedRuntime); + ReleaseObject(pixnStartup); + ReleaseStr(sczSupportedRuntimeVersion); + + return hr; +} + +// Gets the CLR host and caches it. +static HRESULT GetCLRHost( + __in LPCWSTR wzConfigPath, + __out ICorRuntimeHost **ppCLRHost + ) +{ + HRESULT hr = S_OK; + UINT uiMode = 0; + HMODULE hModule = NULL; + BOOL fFallbackToCorBindToCurrentRuntime = TRUE; + CLRCreateInstanceFnPtr pfnCLRCreateInstance = NULL; + ICLRMetaHostPolicy* pCLRMetaHostPolicy = NULL; + IStream* pCfgStream = NULL; + LPWSTR pwzVersion = NULL; + DWORD cchVersion = 0; + DWORD dwConfigFlags = 0; + ICLRRuntimeInfo* pCLRRuntimeInfo = NULL; + PFN_CORBINDTOCURRENTRUNTIME pfnCorBindToCurrentRuntime = NULL; + + // Always set the error mode because we will always restore it below. + uiMode = ::SetErrorMode(0); + + // Cache the CLR host to be shutdown later. This can occur on a different thread. + if (!vpCLRHost) + { + // Disable message boxes from being displayed on error and blocking execution. + ::SetErrorMode(uiMode | SEM_FAILCRITICALERRORS); + + hr = LoadSystemLibrary(L"mscoree.dll", &hModule); + ExitOnFailure(hr, "Failed to load mscoree.dll"); + + pfnCLRCreateInstance = reinterpret_cast(::GetProcAddress(hModule, "CLRCreateInstance")); + + if (pfnCLRCreateInstance) + { + hr = pfnCLRCreateInstance(CLSID_CLRMetaHostPolicy, IID_ICLRMetaHostPolicy, reinterpret_cast(&pCLRMetaHostPolicy)); + if (E_NOTIMPL != hr) + { + ExitOnRootFailure(hr, "Failed to create instance of ICLRMetaHostPolicy."); + + fFallbackToCorBindToCurrentRuntime = FALSE; + } + } + + if (fFallbackToCorBindToCurrentRuntime) + { + pfnCorBindToCurrentRuntime = reinterpret_cast(::GetProcAddress(hModule, "CorBindToCurrentRuntime")); + ExitOnNullWithLastError(pfnCorBindToCurrentRuntime, hr, "Failed to get procedure address for CorBindToCurrentRuntime."); + + hr = pfnCorBindToCurrentRuntime(wzConfigPath, CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); + ExitOnRootFailure(hr, "Failed to create the CLR host using the application configuration file path."); + } + else + { + + hr = SHCreateStreamOnFileEx(wzConfigPath, STGM_READ | STGM_SHARE_DENY_WRITE, 0, FALSE, NULL, &pCfgStream); + ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); + + hr = pCLRMetaHostPolicy->GetRequestedRuntime(METAHOST_POLICY_HIGHCOMPAT, NULL, pCfgStream, NULL, &cchVersion, NULL, NULL, &dwConfigFlags, IID_ICLRRuntimeInfo, reinterpret_cast(&pCLRRuntimeInfo)); + ExitOnRootFailure(hr, "Failed to get the CLR runtime info using the application configuration file path."); + + // .NET 4 RTM had a bug where it wouldn't set pcchVersion if pwzVersion was NULL. + if (!cchVersion) + { + hr = pCLRRuntimeInfo->GetVersionString(NULL, &cchVersion); + if (HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) != hr) + { + ExitOnFailure(hr, "Failed to get the length of the CLR version string."); + } + } + + hr = StrAlloc(&pwzVersion, cchVersion); + ExitOnFailure(hr, "Failed to allocate the CLR version string."); + + hr = pCLRRuntimeInfo->GetVersionString(pwzVersion, &cchVersion); + ExitOnFailure(hr, "Failed to get the CLR version string."); + + if (CSTR_EQUAL == CompareString(LOCALE_NEUTRAL, 0, L"v4.0.30319", -1, pwzVersion, cchVersion)) + { + hr = VerifyNET4RuntimeIsSupported(); + ExitOnFailure(hr, "Found unsupported .NET 4 Runtime."); + } + + if (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_TRUE == (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_MASK & dwConfigFlags)) + { + hr = pCLRRuntimeInfo->BindAsLegacyV2Runtime(); + ExitOnRootFailure(hr, "Failed to bind as legacy V2 runtime."); + } + + hr = pCLRRuntimeInfo->GetInterface(CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); + ExitOnRootFailure(hr, "Failed to get instance of ICorRuntimeHost."); + + // TODO: use ICLRRuntimeHost instead of ICorRuntimeHost on .NET 4 since the former is faster and the latter is deprecated + //hr = pCLRRuntimeInfo->GetInterface(CLSID_CLRRuntimeHost, IID_ICLRRuntimeHost, reinterpret_cast(&pCLRRuntimeHost)); + //ExitOnRootFailure(hr, "Failed to get instance of ICLRRuntimeHost."); + } + } + + vpCLRHost->AddRef(); + *ppCLRHost = vpCLRHost; + +LExit: + ReleaseStr(pwzVersion); + ReleaseNullObject(pCLRRuntimeInfo); + ReleaseNullObject(pCfgStream); + ReleaseNullObject(pCLRMetaHostPolicy); + + // Unload the module so it's not in use when we install .NET. + if (FAILED(hr)) + { + ::FreeLibrary(hModule); + } + + ::SetErrorMode(uiMode); // restore the previous error mode. + + return hr; +} + +// Creates the bootstrapper app and returns it for the engine. +static HRESULT CreateManagedBootstrapperApplication( + __in _AppDomain* pAppDomain, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + IBootstrapperApplicationFactory* pAppFactory = NULL; + IBootstrapperApplication* pApp = NULL; + + hr = CreateManagedBootstrapperApplicationFactory(pAppDomain, &pAppFactory); + ExitOnFailure(hr, "Failed to create the factory to create the bootstrapper application."); + + hr = pAppFactory->Create(pEngine, pArgs->pCommand, &pApp); + ExitOnFailure(hr, "Failed to create the bootstrapper application."); + + pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; + pResults->pvBootstrapperApplicationProcContext = pApp; + pApp = NULL; + +LExit: + ReleaseNullObject(pApp); + ReleaseNullObject(pAppFactory); + + return hr; +} + +// Creates the app factory to create the managed app in the default AppDomain. +static HRESULT CreateManagedBootstrapperApplicationFactory( + __in _AppDomain* pAppDomain, + __out IBootstrapperApplicationFactory** ppAppFactory + ) +{ + HRESULT hr = S_OK; + BSTR bstrAssemblyName = NULL; + BSTR bstrTypeName = NULL; + _ObjectHandle* pObj = NULL; + VARIANT vtBAFactory; + + ::VariantInit(&vtBAFactory); + + bstrAssemblyName = ::SysAllocString(MBA_ASSEMBLY_FULL_NAME); + ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory."); + + bstrTypeName = ::SysAllocString(L"WixToolset.BootstrapperCore.BootstrapperApplicationFactory"); + ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory."); + + hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj); + ExitOnRootFailure(hr, "Failed to create the BA factory object."); + + hr = pObj->Unwrap(&vtBAFactory); + ExitOnRootFailure(hr, "Failed to unwrap the BA factory object into the host domain."); + ExitOnNull(vtBAFactory.punkVal, hr, E_UNEXPECTED, "The variant did not contain the expected IUnknown pointer."); + + hr = vtBAFactory.punkVal->QueryInterface(__uuidof(IBootstrapperApplicationFactory), reinterpret_cast(ppAppFactory)); + ExitOnRootFailure(hr, "Failed to query for the bootstrapper app factory interface."); + +LExit: + ReleaseVariant(vtBAFactory); + ReleaseNullObject(pObj); + ReleaseBSTR(bstrTypeName); + ReleaseBSTR(bstrAssemblyName); + + return hr; +} + +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + LPWSTR sczMbapreqPath = NULL; + HMODULE hModule = NULL; + + hr = PathRelativeToModule(&sczMbapreqPath, L"mbapreq.dll", vhInstance); + ExitOnFailure(hr, "Failed to get path to pre-requisite BA."); + + hModule = ::LoadLibraryW(sczMbapreqPath); + ExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL."); + + PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast(::GetProcAddress(hModule, "MbaPrereqBootstrapperApplicationCreate")); + ExitOnNullWithLastError(pfnCreate, hr, "Failed to get MbaPrereqBootstrapperApplicationCreate entry-point from: %ls", sczMbapreqPath); + + hr = pfnCreate(hrHostInitialization, pEngine, pArgs, pResults); + ExitOnFailure(hr, "Failed to create prequisite bootstrapper app."); + + vhMbapreqModule = hModule; + hModule = NULL; + +LExit: + if (hModule) + { + ::FreeLibrary(hModule); + } + ReleaseStr(sczMbapreqPath); + + return hr; +} + +static HRESULT VerifyNET4RuntimeIsSupported( + ) +{ + HRESULT hr = S_OK; + OS_VERSION osv = OS_VERSION_UNKNOWN; + DWORD dwServicePack = 0; + HKEY hKey = NULL; + DWORD er = ERROR_SUCCESS; + DWORD dwRelease = 0; + DWORD cchRelease = sizeof(dwRelease); + + OsGetVersion(&osv, &dwServicePack); + if (OS_VERSION_WIN7 == osv && 0 == dwServicePack) + { + hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", KEY_QUERY_VALUE, &hKey); + if (E_FILENOTFOUND == hr) + { + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to open registry key for .NET 4."); + + er = ::RegQueryValueExW(hKey, L"Release", NULL, NULL, reinterpret_cast(&dwRelease), &cchRelease); + if (ERROR_FILE_NOT_FOUND == er) + { + ExitFunction1(hr = S_OK); + } + ExitOnWin32Error(er, hr, "Failed to get Release value."); + + if (NET452_RELEASE <= dwRelease) + { + hr = E_MBAHOST_NET452_ON_WIN7RTM; + } + } + +LExit: + ReleaseRegKey(hKey); + + return hr; +} diff --git a/src/mbahost/mbahost.def b/src/mbahost/mbahost.def new file mode 100644 index 00000000..4488df94 --- /dev/null +++ b/src/mbahost/mbahost.def @@ -0,0 +1,6 @@ +; 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. + + +EXPORTS + BootstrapperApplicationCreate + BootstrapperApplicationDestroy diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj new file mode 100644 index 00000000..d40333ab --- /dev/null +++ b/src/mbahost/mbahost.vcxproj @@ -0,0 +1,64 @@ + + + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + + {12C87C77-3547-44F8-8134-29BC915CB19D} + DynamicLibrary + v141 + Unicode + mbahost + mbahost.def + + + + + + + shlwapi.lib + + + + + + Create + + + + + + + + + + + + + + + + + + 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}. + + + + + + + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config new file mode 100644 index 00000000..41ba2f12 --- /dev/null +++ b/src/mbahost/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/mbahost/precomp.cpp b/src/mbahost/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/mbahost/precomp.cpp @@ -0,0 +1,3 @@ +// 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. + +#include "precomp.h" diff --git a/src/wixext/BalBinder.cs b/src/wixext/BalBinder.cs deleted file mode 100644 index 30f7ab44..00000000 --- a/src/wixext/BalBinder.cs +++ /dev/null @@ -1,125 +0,0 @@ -// 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. - -namespace WixToolset.Extensions -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Text; - using WixToolset; - using WixToolset.Data; - using WixToolset.Data.Rows; - using WixToolset.Extensibility; - - public class BalBinder : BinderExtension - { - public override void Finish(Output output) - { - // Only process Bundles. - if (OutputType.Bundle != output.Type) - { - return; - } - - Table baTable = output.Tables["WixBootstrapperApplication"]; - Row baRow = baTable.Rows[0]; - string baId = (string)baRow[0]; - if (null == baId) - { - return; - } - - bool isStdBA = baId.StartsWith("WixStandardBootstrapperApplication"); - bool isMBA = baId.StartsWith("ManagedBootstrapperApplicationHost"); - - if (isStdBA || isMBA) - { - VerifyBAFunctions(output); - } - - if (isMBA) - { - VerifyPrereqPackages(output); - } - } - - private void VerifyBAFunctions(Output output) - { - Row baFunctionsRow = null; - Table baFunctionsTable = output.Tables["WixBalBAFunctions"]; - foreach (Row row in baFunctionsTable.RowsAs()) - { - if (null == baFunctionsRow) - { - baFunctionsRow = row; - } - else - { - this.Core.OnMessage(BalErrors.MultipleBAFunctions(row.SourceLineNumbers)); - } - } - - Table payloadPropertiesTable = output.Tables["WixPayloadProperties"]; - IEnumerable payloadPropertiesRows = payloadPropertiesTable.RowsAs(); - if (null == baFunctionsRow) - { - foreach (WixPayloadPropertiesRow payloadPropertiesRow in payloadPropertiesRows) - { - // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). - if (String.Equals(payloadPropertiesRow.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) - { - this.Core.OnMessage(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesRow.SourceLineNumbers)); - } - } - } - else - { - // TODO: May need to revisit this depending on the outcome of #5273. - string payloadId = (string)baFunctionsRow[0]; - WixPayloadPropertiesRow bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id); - if (Compiler.BurnUXContainerId != bundlePayloadRow.Container) - { - this.Core.OnMessage(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers)); - } - } - } - - private void VerifyPrereqPackages(Output output) - { - Table prereqInfoTable = output.Tables["WixMbaPrereqInformation"]; - if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0) - { - this.Core.OnMessage(BalErrors.MissingPrereq()); - return; - } - - bool foundLicenseFile = false; - bool foundLicenseUrl = false; - - foreach (Row prereqInfoRow in prereqInfoTable.Rows) - { - if (null != prereqInfoRow[1]) - { - if (foundLicenseFile || foundLicenseUrl) - { - this.Core.OnMessage(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); - return; - } - - foundLicenseFile = true; - } - - if (null != prereqInfoRow[2]) - { - if (foundLicenseFile || foundLicenseUrl) - { - this.Core.OnMessage(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); - return; - } - - foundLicenseUrl = true; - } - } - } - } -} diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 38ca9e3c..5b54ef58 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -1,21 +1,22 @@ // 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. -namespace WixToolset.Extensions +namespace WixToolset.Bal { using System; using System.Collections.Generic; using System.Xml.Linq; + using WixToolset.Bal.Tuples; using WixToolset.Data; - using WixToolset.Data.Rows; + using WixToolset.Data.Tuples; using WixToolset.Extensibility; /// /// The compiler for the WiX Toolset Bal Extension. /// - public sealed class BalCompiler : CompilerExtension + public sealed class BalCompiler : BaseCompilerExtension { private SourceLineNumber addedConditionLineNumber; - private Dictionary prereqInfoRows; + private Dictionary prereqInfoRows; /// /// Instantiate a new BalCompiler. @@ -23,17 +24,20 @@ namespace WixToolset.Extensions public BalCompiler() { this.addedConditionLineNumber = null; - prereqInfoRows = new Dictionary(); - this.Namespace = "http://wixtoolset.org/schemas/v4/wxs/bal"; + this.prereqInfoRows = new Dictionary(); } + public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/bal"; + /// /// Processes an element for the Compiler. /// + /// + /// /// Parent element of element to process. /// Element to process. - /// Extra information about the context in which this element is being parsed. - public override void ParseElement(XElement parentElement, XElement element, IDictionary context) + /// Extra information about the context in which this element is being parsed. + public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) { switch (parentElement.Name.LocalName) { @@ -42,10 +46,10 @@ namespace WixToolset.Extensions switch (element.Name.LocalName) { case "Condition": - this.ParseConditionElement(element); + this.ParseConditionElement(intermediate, section, element); break; default: - this.Core.UnexpectedElement(parentElement, element); + this.ParseHelper.UnexpectedElement(parentElement, element); break; } break; @@ -53,18 +57,18 @@ namespace WixToolset.Extensions switch (element.Name.LocalName) { case "WixStandardBootstrapperApplication": - this.ParseWixStandardBootstrapperApplicationElement(element); + this.ParseWixStandardBootstrapperApplicationElement(intermediate, section, element); break; case "WixManagedBootstrapperApplicationHost": - this.ParseWixManagedBootstrapperApplicationHostElement(element); + this.ParseWixManagedBootstrapperApplicationHostElement(intermediate, section, element); break; default: - this.Core.UnexpectedElement(parentElement, element); + this.ParseHelper.UnexpectedElement(parentElement, element); break; } break; default: - this.Core.UnexpectedElement(parentElement, element); + this.ParseHelper.UnexpectedElement(parentElement, element); break; } } @@ -76,10 +80,10 @@ namespace WixToolset.Extensions /// Parent element of element to process. /// Attribute to process. /// Extra information about the context in which this element is being parsed. - public override void ParseAttribute(XElement parentElement, XAttribute attribute, IDictionary context) + public override void ParseAttribute(Intermediate intermediate, IntermediateSection section, XElement parentElement, XAttribute attribute, IDictionary context) { - SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(parentElement); - Row row; + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(parentElement); + WixMbaPrereqInformationTuple prereqInfo; switch (parentElement.Name.LocalName) { @@ -90,7 +94,7 @@ namespace WixToolset.Extensions string packageId; if (!context.TryGetValue("PackageId", out packageId) || String.IsNullOrEmpty(packageId)) { - this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); } else { @@ -98,80 +102,80 @@ namespace WixToolset.Extensions { case "PrereqLicenseFile": - if (!prereqInfoRows.TryGetValue(packageId, out row)) + if (!this.prereqInfoRows.TryGetValue(packageId, out prereqInfo)) { // at the time the extension attribute is parsed, the compiler might not yet have // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. XAttribute prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); - if (null != prereqPackage && YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) + if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - row = this.Core.CreateRow(sourceLineNumbers, "WixMbaPrereqInformation"); - row[0] = packageId; + prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixMbaPrereqInformation"); + prereqInfo.PackageId = packageId; - prereqInfoRows.Add(packageId, row); + this.prereqInfoRows.Add(packageId, prereqInfo); } else { - this.Core.OnMessage(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile")); + this.Messaging.Write(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile")); break; } } - if (null != row[2]) + if (null != prereqInfo.LicenseUrl) { - this.Core.OnMessage(WixErrors.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile", "PrereqLicenseUrl")); + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile", "PrereqLicenseUrl")); } else { - row[1] = this.Core.GetAttributeValue(sourceLineNumbers, attribute); + prereqInfo.LicenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); } break; case "PrereqLicenseUrl": - if (!prereqInfoRows.TryGetValue(packageId, out row)) + if (!this.prereqInfoRows.TryGetValue(packageId, out prereqInfo)) { // at the time the extension attribute is parsed, the compiler might not yet have // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. XAttribute prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); - if (null != prereqPackage && YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) + if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - row = this.Core.CreateRow(sourceLineNumbers, "WixMbaPrereqInformation"); - row[0] = packageId; + prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixMbaPrereqInformation"); + prereqInfo.PackageId = packageId; - prereqInfoRows.Add(packageId, row); + this.prereqInfoRows.Add(packageId, prereqInfo); } else { - this.Core.OnMessage(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl")); + this.Messaging.Write(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl")); break; } } - if (null != row[1]) + if (null != prereqInfo.LicenseFile) { - this.Core.OnMessage(WixErrors.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl", "PrereqLicenseFile")); + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl", "PrereqLicenseFile")); } else { - row[2] = this.Core.GetAttributeValue(sourceLineNumbers, attribute); + prereqInfo.LicenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); } break; case "PrereqPackage": - if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - if (!prereqInfoRows.TryGetValue(packageId, out row)) + if (!this.prereqInfoRows.TryGetValue(packageId, out prereqInfo)) { - row = this.Core.CreateRow(sourceLineNumbers, "WixMbaPrereqInformation"); - row[0] = packageId; + prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixMbaPrereqInformation"); + prereqInfo.PackageId = packageId; - prereqInfoRows.Add(packageId, row); + this.prereqInfoRows.Add(packageId, prereqInfo); } } break; default: - this.Core.UnexpectedAttribute(parentElement, attribute); + this.ParseHelper.UnexpectedAttribute(parentElement, attribute); break; } } @@ -180,21 +184,21 @@ namespace WixToolset.Extensions string payloadId; if (!context.TryGetValue("Id", out payloadId) || String.IsNullOrEmpty(payloadId)) { - this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); } else { switch (attribute.Name.LocalName) { case "BAFunctions": - if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - row = this.Core.CreateRow(sourceLineNumbers, "WixBalBAFunctions"); - row[0] = payloadId; + var tuple = (WixBalBAFunctionsTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBalBAFunctions"); + tuple.PayloadId = payloadId; } break; default: - this.Core.UnexpectedAttribute(parentElement, attribute); + this.ParseHelper.UnexpectedAttribute(parentElement, attribute); break; } } @@ -205,21 +209,21 @@ namespace WixToolset.Extensions XAttribute variableName = parentElement.Attribute("Name"); if (null == variableName) { - this.Core.OnMessage(WixErrors.ExpectedParentWithAttribute(sourceLineNumbers, "Variable", "Overridable", "Name")); + this.Messaging.Write(ErrorMessages.ExpectedParentWithAttribute(sourceLineNumbers, "Variable", "Overridable", "Name")); } else { switch (attribute.Name.LocalName) { case "Overridable": - if (YesNoType.Yes == this.Core.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - row = this.Core.CreateRow(sourceLineNumbers, "WixStdbaOverridableVariable"); - row[0] = variableName; + var tuple = (WixStdbaOverridableVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixStdbaOverridableVariable"); + tuple.Name = variableName.Value; } break; default: - this.Core.UnexpectedAttribute(parentElement, attribute); + this.ParseHelper.UnexpectedAttribute(parentElement, attribute); break; } } @@ -231,10 +235,10 @@ namespace WixToolset.Extensions /// Parses a Condition element for Bundles. /// /// The element to parse. - private void ParseConditionElement(XElement node) + private void ParseConditionElement(Intermediate intermediate, IntermediateSection section, XElement node) { - SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); - string condition = this.Core.GetConditionInnerText(node); // condition is the inner text of the element. + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + string condition = this.ParseHelper.GetConditionInnerText(node); // condition is the inner text of the element. string message = null; foreach (XAttribute attrib in node.Attributes()) @@ -244,37 +248,37 @@ namespace WixToolset.Extensions switch (attrib.Name.LocalName) { case "Message": - message = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + message = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; default: - this.Core.UnexpectedAttribute(node, attrib); + this.ParseHelper.UnexpectedAttribute(node, attrib); break; } } else { - this.Core.ParseExtensionAttribute(node, attrib); + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); } } - this.Core.ParseForExtensionElements(node); + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); // Error check the values. if (String.IsNullOrEmpty(condition)) { - this.Core.OnMessage(WixErrors.ConditionExpected(sourceLineNumbers, node.Name.LocalName)); + this.Messaging.Write(ErrorMessages.ConditionExpected(sourceLineNumbers, node.Name.LocalName)); } if (null == message) { - this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Message")); + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Message")); } - if (!this.Core.EncounteredError) + if (!this.Messaging.EncounteredError) { - Row row = this.Core.CreateRow(sourceLineNumbers, "WixBalCondition"); - row[0] = condition; - row[1] = message; + var tuple = (WixBalConditionTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBalCondition"); + tuple.Condition = condition; + tuple.Message = message; if (null == this.addedConditionLineNumber) { @@ -287,9 +291,9 @@ namespace WixToolset.Extensions /// Parses a WixStandardBootstrapperApplication element for Bundles. /// /// The element to parse. - private void ParseWixStandardBootstrapperApplicationElement(XElement node) + private void ParseWixStandardBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node) { - SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); string launchTarget = null; string launchTargetElevatedId = null; string launchArguments = null; @@ -314,101 +318,101 @@ namespace WixToolset.Extensions switch (attrib.Name.LocalName) { case "LaunchTarget": - launchTarget = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + launchTarget = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "LaunchTargetElevatedId": - launchTargetElevatedId = this.Core.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + launchTargetElevatedId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); break; case "LaunchArguments": - launchArguments = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + launchArguments = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "LaunchHidden": - launchHidden = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + launchHidden = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; case "LaunchWorkingFolder": - launchWorkingDir = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + launchWorkingDir = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "LicenseFile": - licenseFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + licenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "LicenseUrl": - licenseUrl = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); + licenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); break; case "LogoFile": - logoFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "LogoSideFile": - logoSideFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + logoSideFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "ThemeFile": - themeFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "LocalizationFile": - localizationFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "SuppressOptionsUI": - suppressOptionsUI = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + suppressOptionsUI = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; case "SuppressDowngradeFailure": - suppressDowngradeFailure = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + suppressDowngradeFailure = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; case "SuppressRepair": - suppressRepair = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + suppressRepair = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; case "ShowVersion": - showVersion = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + showVersion = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; case "SupportCacheOnly": - supportCacheOnly = this.Core.GetAttributeYesNoValue(sourceLineNumbers, attrib); + supportCacheOnly = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; default: - this.Core.UnexpectedAttribute(node, attrib); + this.ParseHelper.UnexpectedAttribute(node, attrib); break; } } else { - this.Core.ParseExtensionAttribute(node, attrib); + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); } } - this.Core.ParseForExtensionElements(node); + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); if (String.IsNullOrEmpty(licenseFile) && null == licenseUrl) { - this.Core.OnMessage(WixErrors.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true)); + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true)); } - if (!this.Core.EncounteredError) + if (!this.Messaging.EncounteredError) { if (!String.IsNullOrEmpty(launchTarget)) { - WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixBundleVariable"); - row.Id = "LaunchTarget"; + var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable"); + row.Id = new Identifier("LaunchTarget", AccessModifier.Public); row.Value = launchTarget; row.Type = "string"; } if (!String.IsNullOrEmpty(launchTargetElevatedId)) { - WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixBundleVariable"); - row.Id = "LaunchTargetElevatedId"; + var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable"); + row.Id = new Identifier("LaunchTargetElevatedId", AccessModifier.Public); row.Value = launchTargetElevatedId; row.Type = "string"; } if (!String.IsNullOrEmpty(launchArguments)) { - WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixBundleVariable"); - row.Id = "LaunchArguments"; + var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable"); + row.Id = new Identifier("LaunchArguments", AccessModifier.Public); row.Value = launchArguments; row.Type = "string"; } if (YesNoType.Yes == launchHidden) { - WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixBundleVariable"); - row.Id = "LaunchHidden"; + var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable"); + row.Id = new Identifier("LaunchHidden", AccessModifier.Public); row.Value = "yes"; row.Type = "string"; } @@ -416,80 +420,80 @@ namespace WixToolset.Extensions if (!String.IsNullOrEmpty(launchWorkingDir)) { - WixBundleVariableRow row = (WixBundleVariableRow)this.Core.CreateRow(sourceLineNumbers, "Variable"); - row.Id = "LaunchWorkingFolder"; + var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "Variable"); + row.Id = new Identifier("LaunchWorkingFolder", AccessModifier.Public); row.Value = launchWorkingDir; row.Type = "string"; } if (!String.IsNullOrEmpty(licenseFile)) { - WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = "WixStdbaLicenseRtf"; + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier("WixStdbaLicenseRtf", AccessModifier.Public); wixVariableRow.Value = licenseFile; } if (null != licenseUrl) { - WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = "WixStdbaLicenseUrl"; + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier("WixStdbaLicenseUrl", AccessModifier.Public); wixVariableRow.Value = licenseUrl; } if (!String.IsNullOrEmpty(logoFile)) { - WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = "WixStdbaLogo"; + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier("WixStdbaLogo", AccessModifier.Public); wixVariableRow.Value = logoFile; } if (!String.IsNullOrEmpty(logoSideFile)) { - WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = "WixStdbaLogoSide"; + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier("WixStdbaLogoSide", AccessModifier.Public); wixVariableRow.Value = logoSideFile; } if (!String.IsNullOrEmpty(themeFile)) { - WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = "WixStdbaThemeXml"; + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier("WixStdbaThemeXml", AccessModifier.Public); wixVariableRow.Value = themeFile; } if (!String.IsNullOrEmpty(localizationFile)) { - WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = "WixStdbaThemeWxl"; + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier("WixStdbaThemeWxl", AccessModifier.Public); wixVariableRow.Value = localizationFile; } if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly) { - Row row = this.Core.CreateRow(sourceLineNumbers, "WixStdbaOptions"); + var tuple = (WixStdbaOptionsTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixStdbaOptions"); if (YesNoType.Yes == suppressOptionsUI) { - row[0] = 1; + tuple.SuppressOptionsUI = 1; } if (YesNoType.Yes == suppressDowngradeFailure) { - row[1] = 1; + tuple.SuppressDowngradeFailure = 1; } if (YesNoType.Yes == suppressRepair) { - row[2] = 1; + tuple.SuppressRepair = 1; } if (YesNoType.Yes == showVersion) { - row[3] = 1; + tuple.ShowVersion = 1; } if (YesNoType.Yes == supportCacheOnly) { - row[4] = 1; + tuple.SupportCacheOnly = 1; } } } @@ -499,9 +503,9 @@ namespace WixToolset.Extensions /// Parses a WixManagedBootstrapperApplicationHost element for Bundles. /// /// The element to parse. - private void ParseWixManagedBootstrapperApplicationHostElement(XElement node) + private void ParseWixManagedBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node) { - SourceLineNumber sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); + SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); string logoFile = null; string themeFile = null; string localizationFile = null; @@ -513,47 +517,47 @@ namespace WixToolset.Extensions switch (attrib.Name.LocalName) { case "LogoFile": - logoFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "ThemeFile": - themeFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; case "LocalizationFile": - localizationFile = this.Core.GetAttributeValue(sourceLineNumbers, attrib); + localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; default: - this.Core.UnexpectedAttribute(node, attrib); + this.ParseHelper.UnexpectedAttribute(node, attrib); break; } } else { - this.Core.ParseExtensionAttribute(node, attrib); + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); } } - this.Core.ParseForExtensionElements(node); + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - if (!this.Core.EncounteredError) + if (!this.Messaging.EncounteredError) { if (!String.IsNullOrEmpty(logoFile)) { - WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = "PreqbaLogo"; + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier("PreqbaLogo", AccessModifier.Public); wixVariableRow.Value = logoFile; } if (!String.IsNullOrEmpty(themeFile)) { - WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = "PreqbaThemeXml"; + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier("PreqbaThemeXml", AccessModifier.Public); wixVariableRow.Value = themeFile; } if (!String.IsNullOrEmpty(localizationFile)) { - WixVariableRow wixVariableRow = (WixVariableRow)this.Core.CreateRow(sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = "PreqbaThemeWxl"; + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier("PreqbaThemeWxl", AccessModifier.Public); wixVariableRow.Value = localizationFile; } } diff --git a/src/wixext/BalErrors.cs b/src/wixext/BalErrors.cs new file mode 100644 index 00000000..5591ae1d --- /dev/null +++ b/src/wixext/BalErrors.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Resources; + using WixToolset.Data; + + public static class BalErrors + { + public static Message AttributeRequiresPrereqPackage(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) + { + return Message(sourceLineNumbers, Ids.AttributeRequiresPrereqPackage, "When the {0}/@{1} attribute is specified, the {0}/@PrereqPackage attribute must be set to \"yes\".", elementName, attributeName); + } + + public static Message BAFunctionsPayloadRequiredInUXContainer(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.BAFunctionsPayloadRequiredInUXContainer, "The BAFunctions DLL Payload element must be located inside the BootstrapperApplication container."); + } + + public static Message MissingPrereq() + { + return Message(null, Ids.MissingPrereq, "There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups."); + } + + public static Message MultipleBAFunctions(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.MultipleBAFunctions, "WixStandardBootstrapperApplication doesn't support multiple BAFunctions DLLs."); + } + + public static Message MultiplePrereqLicenses(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.MultiplePrereqLicenses, "There may only be one package in the bundle that has either the PrereqLicenseFile attribute or the PrereqLicenseUrl attribute."); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Error, (int)id, resourceManager, resourceName, args); + } + + public enum Ids + { + AttributeRequiresPrereqPackage = 6801, + MissingPrereq = 6802, + MultiplePrereqLicenses = 6803, + MultipleBAFunctions = 6804, + BAFunctionsPayloadRequiredInUXContainer = 6805, + } + } +} diff --git a/src/wixext/BalExtensionData.cs b/src/wixext/BalExtensionData.cs index 7e8dea5b..46152b53 100644 --- a/src/wixext/BalExtensionData.cs +++ b/src/wixext/BalExtensionData.cs @@ -1,55 +1,30 @@ // 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. -namespace WixToolset.Extensions +namespace WixToolset.Bal { - using System; - using System.Reflection; using WixToolset.Data; using WixToolset.Extensibility; /// /// The WiX Toolset Bal Extension. /// - public sealed class BalExtensionData : ExtensionData + public sealed class BalExtensionData : BaseExtensionData { /// - /// Gets the optional table definitions for this extension. + /// Gets the default culture. /// - /// The optional table definitions for this extension. - public override TableDefinitionCollection TableDefinitions - { - get - { - return BalExtensionData.GetExtensionTableDefinitions(); - } - } + /// The default culture. + public override string DefaultCulture => "en-US"; - /// - /// Gets the library associated with this extension. - /// - /// The table definitions to use while loading the library. - /// The loaded library. - public override Library GetLibrary(TableDefinitionCollection tableDefinitions) + public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) { - return BalExtensionData.GetExtensionLibrary(tableDefinitions); + tupleDefinition = BalTupleDefinitions.ByName(name); + return tupleDefinition != null; } - /// - /// Internal mechanism to access the extension's table definitions. - /// - /// Extension's table definitions. - internal static TableDefinitionCollection GetExtensionTableDefinitions() - { - return ExtensionData.LoadTableDefinitionHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.tables.xml"); - } - - /// - /// Internal mechanism to access the extension's library. - /// - /// Extension's library. - internal static Library GetExtensionLibrary(TableDefinitionCollection tableDefinitions) + public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) { - return ExtensionData.LoadLibraryHelper(Assembly.GetExecutingAssembly(), "WixToolset.Extensions.Data.bal.wixlib", tableDefinitions); + return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", tupleDefinitions); } } } diff --git a/src/wixext/BalExtensionFactory.cs b/src/wixext/BalExtensionFactory.cs new file mode 100644 index 00000000..936686a6 --- /dev/null +++ b/src/wixext/BalExtensionFactory.cs @@ -0,0 +1,18 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Collections.Generic; + using WixToolset.Extensibility; + + public class BalExtensionFactory : BaseExtensionFactory + { + protected override IEnumerable ExtensionTypes => new[] + { + typeof(BalCompiler), + typeof(BalExtensionData), + typeof(BalWindowsInstallerBackendBinderExtension), + }; + } +} diff --git a/src/wixext/BalWarnings.cs b/src/wixext/BalWarnings.cs new file mode 100644 index 00000000..18b25062 --- /dev/null +++ b/src/wixext/BalWarnings.cs @@ -0,0 +1,31 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Resources; + using WixToolset.Data; + + public static class BalWarnings + { + public static Message UnmarkedBAFunctionsDLL(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.UnmarkedBAFunctionsDLL, "WixStandardBootstrapperApplication doesn't automatically load BAFunctions.dll. Use the bal:BAFunctions attribute to indicate that it should be loaded."); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, resourceManager, resourceName, args); + } + + public enum Ids + { + UnmarkedBAFunctionsDLL = 6501, + } + } +} diff --git a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs new file mode 100644 index 00000000..fbda9d1b --- /dev/null +++ b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs @@ -0,0 +1,146 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Linq; + using System.Xml; + using WixToolset.Data; + using WixToolset.Data.WindowsInstaller; + using WixToolset.Data.WindowsInstaller.Rows; + using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; + + public class BalWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension + { + // TODO: don't duplicate this from WixToolset.Core.Compiler + public const string BurnUXContainerId = "WixUXContainer"; + + private static readonly TableDefinition[] Tables = LoadTables(); + + protected override TableDefinition[] TableDefinitionsForTuples => Tables; + + private static TableDefinition[] LoadTables() + { + using (var resourceStream = typeof(BalWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Bal.tables.xml")) + using (var reader = XmlReader.Create(resourceStream)) + { + var tables = TableDefinitionCollection.Load(reader); + return tables.ToArray(); + } + } + + public override void PostBackendBind(BindResult result, Pdb pdb) + { + base.PostBackendBind(result, pdb); + + var output = pdb.Output; + + // Only process Bundles. + if (OutputType.Bundle != output.Type) + { + return; + } + + var baTable = output.Tables["WixBootstrapperApplication"]; + var baRow = baTable.Rows[0]; + var baId = (string)baRow[0]; + if (null == baId) + { + return; + } + + var isStdBA = baId.StartsWith("WixStandardBootstrapperApplication"); + var isMBA = baId.StartsWith("ManagedBootstrapperApplicationHost"); + + if (isStdBA || isMBA) + { + this.VerifyBAFunctions(output); + } + + if (isMBA) + { + this.VerifyPrereqPackages(output); + } + } + + private void VerifyBAFunctions(Output output) + { + Row baFunctionsRow = null; + var baFunctionsTable = output.Tables["WixBalBAFunctions"]; + foreach (var row in baFunctionsTable.Rows) + { + if (null == baFunctionsRow) + { + baFunctionsRow = row; + } + else + { + this.Messaging.Write(BalErrors.MultipleBAFunctions(row.SourceLineNumbers)); + } + } + + var payloadPropertiesTable = output.Tables["WixPayloadProperties"]; + var payloadPropertiesRows = payloadPropertiesTable.Rows.Cast(); + if (null == baFunctionsRow) + { + foreach (var payloadPropertiesRow in payloadPropertiesRows) + { + // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). + if (string.Equals(payloadPropertiesRow.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) + { + this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesRow.SourceLineNumbers)); + } + } + } + else + { + // TODO: May need to revisit this depending on the outcome of #5273. + var payloadId = (string)baFunctionsRow[0]; + var bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id); + if (BurnUXContainerId != bundlePayloadRow.Container) + { + this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers)); + } + } + } + + private void VerifyPrereqPackages(Output output) + { + var prereqInfoTable = output.Tables["WixMbaPrereqInformation"]; + if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0) + { + this.Messaging.Write(BalErrors.MissingPrereq()); + return; + } + + var foundLicenseFile = false; + var foundLicenseUrl = false; + + foreach (Row prereqInfoRow in prereqInfoTable.Rows) + { + if (null != prereqInfoRow[1]) + { + if (foundLicenseFile || foundLicenseUrl) + { + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); + return; + } + + foundLicenseFile = true; + } + + if (null != prereqInfoRow[2]) + { + if (foundLicenseFile || foundLicenseUrl) + { + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); + return; + } + + foundLicenseUrl = true; + } + } + } + } +} diff --git a/src/wixext/Tuples/BalTupleDefinitions.cs b/src/wixext/Tuples/BalTupleDefinitions.cs new file mode 100644 index 00000000..676db9f6 --- /dev/null +++ b/src/wixext/Tuples/BalTupleDefinitions.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using WixToolset.Data; + + public enum BalTupleDefinitionType + { + WixBalBAFunctions, + WixBalCondition, + WixMbaPrereqInformation, + WixStdbaOptions, + WixStdbaOverridableVariable, + } + + public static partial class BalTupleDefinitions + { + public static readonly Version Version = new Version("4.0.0"); + + public static IntermediateTupleDefinition ByName(string name) + { + if (!Enum.TryParse(name, out BalTupleDefinitionType type)) + { + return null; + } + + return ByType(type); + } + + public static IntermediateTupleDefinition ByType(BalTupleDefinitionType type) + { + switch (type) + { + case BalTupleDefinitionType.WixBalBAFunctions: + return BalTupleDefinitions.WixBalBAFunctions; + + case BalTupleDefinitionType.WixBalCondition: + return BalTupleDefinitions.WixBalCondition; + + case BalTupleDefinitionType.WixMbaPrereqInformation: + return BalTupleDefinitions.WixMbaPrereqInformation; + + case BalTupleDefinitionType.WixStdbaOptions: + return BalTupleDefinitions.WixStdbaOptions; + + case BalTupleDefinitionType.WixStdbaOverridableVariable: + return BalTupleDefinitions.WixStdbaOverridableVariable; + + default: + throw new ArgumentOutOfRangeException(nameof(type)); + } + } + } +} diff --git a/src/wixext/Tuples/WixBalBAFunctionsTuple.cs b/src/wixext/Tuples/WixBalBAFunctionsTuple.cs new file mode 100644 index 00000000..f753f239 --- /dev/null +++ b/src/wixext/Tuples/WixBalBAFunctionsTuple.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Tuples; + + public static partial class BalTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixBalBAFunctions = new IntermediateTupleDefinition( + BalTupleDefinitionType.WixBalBAFunctions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalBAFunctionsTupleFields.PayloadId), IntermediateFieldType.String), + }, + typeof(WixBalBAFunctionsTuple)); + } +} + +namespace WixToolset.Bal.Tuples +{ + using WixToolset.Data; + + public enum WixBalBAFunctionsTupleFields + { + PayloadId, + } + + public class WixBalBAFunctionsTuple : IntermediateTuple + { + public WixBalBAFunctionsTuple() : base(BalTupleDefinitions.WixBalBAFunctions, null, null) + { + } + + public WixBalBAFunctionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFunctions, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalBAFunctionsTupleFields index] => this.Fields[(int)index]; + + public string PayloadId + { + get => this.Fields[(int)WixBalBAFunctionsTupleFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFunctionsTupleFields.PayloadId, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalConditionTuple.cs b/src/wixext/Tuples/WixBalConditionTuple.cs new file mode 100644 index 00000000..4c0ddd1d --- /dev/null +++ b/src/wixext/Tuples/WixBalConditionTuple.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Tuples; + + public static partial class BalTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixBalCondition = new IntermediateTupleDefinition( + BalTupleDefinitionType.WixBalCondition.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Message), IntermediateFieldType.String), + }, + typeof(WixBalConditionTuple)); + } +} + +namespace WixToolset.Bal.Tuples +{ + using WixToolset.Data; + + public enum WixBalConditionTupleFields + { + Condition, + Message, + } + + public class WixBalConditionTuple : IntermediateTuple + { + public WixBalConditionTuple() : base(BalTupleDefinitions.WixBalCondition, null, null) + { + } + + public WixBalConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalCondition, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalConditionTupleFields index] => this.Fields[(int)index]; + + public string Condition + { + get => this.Fields[(int)WixBalConditionTupleFields.Condition].AsString(); + set => this.Set((int)WixBalConditionTupleFields.Condition, value); + } + + public string Message + { + get => this.Fields[(int)WixBalConditionTupleFields.Message].AsString(); + set => this.Set((int)WixBalConditionTupleFields.Message, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs b/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs new file mode 100644 index 00000000..bcbe9f84 --- /dev/null +++ b/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs @@ -0,0 +1,63 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Tuples; + + public static partial class BalTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixMbaPrereqInformation = new IntermediateTupleDefinition( + BalTupleDefinitionType.WixMbaPrereqInformation.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseUrl), IntermediateFieldType.String), + }, + typeof(WixMbaPrereqInformationTuple)); + } +} + +namespace WixToolset.Bal.Tuples +{ + using WixToolset.Data; + + public enum WixMbaPrereqInformationTupleFields + { + PackageId, + LicenseFile, + LicenseUrl, + } + + public class WixMbaPrereqInformationTuple : IntermediateTuple + { + public WixMbaPrereqInformationTuple() : base(BalTupleDefinitions.WixMbaPrereqInformation, null, null) + { + } + + public WixMbaPrereqInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixMbaPrereqInformation, sourceLineNumber, id) + { + } + + public IntermediateField this[WixMbaPrereqInformationTupleFields index] => this.Fields[(int)index]; + + public string PackageId + { + get => this.Fields[(int)WixMbaPrereqInformationTupleFields.PackageId].AsString(); + set => this.Set((int)WixMbaPrereqInformationTupleFields.PackageId, value); + } + + public string LicenseFile + { + get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseFile].AsString(); + set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseFile, value); + } + + public string LicenseUrl + { + get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseUrl].AsString(); + set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseUrl, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/WixStdbaOptionsTuple.cs b/src/wixext/Tuples/WixStdbaOptionsTuple.cs new file mode 100644 index 00000000..d930eb47 --- /dev/null +++ b/src/wixext/Tuples/WixStdbaOptionsTuple.cs @@ -0,0 +1,79 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Tuples; + + public static partial class BalTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixStdbaOptions = new IntermediateTupleDefinition( + BalTupleDefinitionType.WixStdbaOptions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressOptionsUI), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressDowngradeFailure), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressRepair), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.ShowVersion), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SupportCacheOnly), IntermediateFieldType.Number), + }, + typeof(WixStdbaOptionsTuple)); + } +} + +namespace WixToolset.Bal.Tuples +{ + using WixToolset.Data; + + public enum WixStdbaOptionsTupleFields + { + SuppressOptionsUI, + SuppressDowngradeFailure, + SuppressRepair, + ShowVersion, + SupportCacheOnly, + } + + public class WixStdbaOptionsTuple : IntermediateTuple + { + public WixStdbaOptionsTuple() : base(BalTupleDefinitions.WixStdbaOptions, null, null) + { + } + + public WixStdbaOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOptions, sourceLineNumber, id) + { + } + + public IntermediateField this[WixStdbaOptionsTupleFields index] => this.Fields[(int)index]; + + public int SuppressOptionsUI + { + get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressOptionsUI].AsNumber(); + set => this.Set((int)WixStdbaOptionsTupleFields.SuppressOptionsUI, value); + } + + public int SuppressDowngradeFailure + { + get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure].AsNumber(); + set => this.Set((int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure, value); + } + + public int SuppressRepair + { + get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressRepair].AsNumber(); + set => this.Set((int)WixStdbaOptionsTupleFields.SuppressRepair, value); + } + + public int ShowVersion + { + get => this.Fields[(int)WixStdbaOptionsTupleFields.ShowVersion].AsNumber(); + set => this.Set((int)WixStdbaOptionsTupleFields.ShowVersion, value); + } + + public int SupportCacheOnly + { + get => this.Fields[(int)WixStdbaOptionsTupleFields.SupportCacheOnly].AsNumber(); + set => this.Set((int)WixStdbaOptionsTupleFields.SupportCacheOnly, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs b/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs new file mode 100644 index 00000000..3ba982ea --- /dev/null +++ b/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Tuples; + + public static partial class BalTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixStdbaOverridableVariable = new IntermediateTupleDefinition( + BalTupleDefinitionType.WixStdbaOverridableVariable.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableTupleFields.Name), IntermediateFieldType.String), + }, + typeof(WixStdbaOverridableVariableTuple)); + } +} + +namespace WixToolset.Bal.Tuples +{ + using WixToolset.Data; + + public enum WixStdbaOverridableVariableTupleFields + { + Name, + } + + public class WixStdbaOverridableVariableTuple : IntermediateTuple + { + public WixStdbaOverridableVariableTuple() : base(BalTupleDefinitions.WixStdbaOverridableVariable, null, null) + { + } + + public WixStdbaOverridableVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id) + { + } + + public IntermediateField this[WixStdbaOverridableVariableTupleFields index] => this.Fields[(int)index]; + + public string Name + { + get => this.Fields[(int)WixStdbaOverridableVariableTupleFields.Name].AsString(); + set => this.Set((int)WixStdbaOverridableVariableTupleFields.Name, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/WixBalExtension.csproj b/src/wixext/WixBalExtension.csproj deleted file mode 100644 index 3e9d382e..00000000 --- a/src/wixext/WixBalExtension.csproj +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - {BF720A63-9D7B-456E-B60C-8122852D9FED} - WixBalExtension - Library - WixToolset.Extensions - - - - - - - - $(RootNamespace).Data.Messages.resources - - - $(RootNamespace).Data.tables.xml - - - $(RootNamespace).Xsd.bal.xsd - PreserveNewest - - - WixToolset.Data.Serialize - WixToolset.Extensions.Serialize.Bal - - - Data\bal.wixlib - - - - - - - - - - - false - - - - diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj new file mode 100644 index 00000000..49f891d3 --- /dev/null +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -0,0 +1,30 @@ + + + + + + netstandard2.0 + WixToolset.Bal + WiX Toolset Bal Extension + WiX Toolset Bal Extension + true + build + + + + + + + + + + + + + + + + + + + diff --git a/src/wixext/WixToolset.Bal.wixext.targets b/src/wixext/WixToolset.Bal.wixext.targets new file mode 100644 index 00000000..70c5a19c --- /dev/null +++ b/src/wixext/WixToolset.Bal.wixext.targets @@ -0,0 +1,11 @@ + + + + + + $(MSBuildThisFileDirectory)..\tools\WixToolset.Bal.wixext.dll + + + + + diff --git a/src/wixext/messages.xml b/src/wixext/messages.xml deleted file mode 100644 index 9b11981d..00000000 --- a/src/wixext/messages.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - When the {0}/@{1} attribute is specified, the {0}/@PrereqPackage attribute must be set to "yes". - - - - - - - There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost. - This is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups. - - - - - There may only be one package in the bundle that has either the PrereqLicenseFile attribute or the PrereqLicenseUrl attribute. - - - - - WixStandardBootstrapperApplication doesn't support multiple BAFunctions DLLs. - - - - - The BAFunctions DLL Payload element must be located inside the BootstrapperApplication container. - - - - - - - WixStandardBootstrapperApplication doesn't automatically load BAFunctions.dll. Use the bal:BAFunctions attribute to indicate that it should be loaded. - - - - diff --git a/src/wixlib/BalExtension.wixproj b/src/wixlib/BalExtension.wixproj deleted file mode 100644 index e2898e83..00000000 --- a/src/wixlib/BalExtension.wixproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - {3444D952-F21C-496F-AB6B-56435BFD0787} - bal - Library - true - true - en-us - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj new file mode 100644 index 00000000..be15229b --- /dev/null +++ b/src/wixlib/bal.wixproj @@ -0,0 +1,62 @@ + + + + + + + {3444D952-F21C-496F-AB6B-56435BFD0787} + bal + Library + true + true + en-us + + + + + + + + + + + + + + + + + + mbahost + {12C87C77-3547-44F8-8134-29BC915CB19D} + + + wixstdba + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} + + + + + + + + + + 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}. + + + + + + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config new file mode 100644 index 00000000..7964daed --- /dev/null +++ b/src/wixlib/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config new file mode 100644 index 00000000..41ba2f12 --- /dev/null +++ b/src/wixstdba/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/wixstdba/precomp.cpp b/src/wixstdba/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/wixstdba/precomp.cpp @@ -0,0 +1,3 @@ +// 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. + +#include "precomp.h" diff --git a/src/wixstdba/precomp.h b/src/wixstdba/precomp.h index a0390fe2..925a80ce 100644 --- a/src/wixstdba/precomp.h +++ b/src/wixstdba/precomp.h @@ -3,7 +3,12 @@ #include + +#pragma warning(push) +#pragma warning(disable:4458) // declaration of 'xxx' hides class member #include +#pragma warning(pop) + #include #include #include diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index ddc0bc57..8ee9ace9 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -1,8 +1,11 @@ + + + + - Debug @@ -13,33 +16,27 @@ Win32 - - - Debug - ARM - - - Release - ARM - - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} DynamicLibrary + v141 Unicode WixStdBA wixstdba.def - + + - $(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc - comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;wixstdba.res + comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;wixstdba.res + + Create + @@ -93,7 +90,9 @@ - + + + Compiling message file... mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z wixstdba.messages "$(InputDir)wixstdba.mc" @@ -102,5 +101,15 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - + + + + + 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}. + + + + + + diff --git a/version.json b/version.json new file mode 100644 index 00000000..5f857771 --- /dev/null +++ b/version.json @@ -0,0 +1,11 @@ +{ + "version": "4.0", + "publicReleaseRefSpec": [ + "^refs/heads/master$" + ], + "cloudBuild": { + "buildNumber": { + "enabled": true + } + } +} -- cgit v1.2.3-55-g6feb From 42a8a6a81253770748f26795fd09a8edd1ffca96 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 13 Jan 2019 19:29:23 -0600 Subject: Update to latest Cpp.Build.props for locating latest Win10 SDK. --- src/Cpp.Build.props | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 296b36ca..0e00132b 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -8,6 +8,10 @@ $(OutputPath)$(Platform)\ + + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + $(DisableSpecificCompilerWarnings) @@ -16,7 +20,7 @@ WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) Use precomp.h - StdCall + StdCall true false -YlprecompDefine -- cgit v1.2.3-55-g6feb From ae67928056de9a1933eb0272fdd9d3f22af067d4 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 13 Jan 2019 19:44:00 -0600 Subject: Build bafunctions.vcxproj --- Bal.wixext.sln | 10 +++ src/Samples/bafunctions/bafunctions.rc | 118 ---------------------------- src/Samples/bafunctions/bafunctions.vcxproj | 45 +++++++---- src/Samples/bafunctions/bafunctionsver.h | 13 --- src/Samples/bafunctions/packages.config | 7 ++ src/Samples/bafunctions/precomp.h | 5 ++ 6 files changed, 50 insertions(+), 148 deletions(-) delete mode 100644 src/Samples/bafunctions/bafunctions.rc delete mode 100644 src/Samples/bafunctions/bafunctionsver.h create mode 100644 src/Samples/bafunctions/packages.config (limited to 'src') diff --git a/Bal.wixext.sln b/Bal.wixext.sln index 8ec796c3..38041e89 100644 --- a/Bal.wixext.sln +++ b/Bal.wixext.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.28010.2016 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "src\mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "src\wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}" @@ -19,6 +21,14 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.Build.0 = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.ActiveCfg = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.Build.0 = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.ActiveCfg = Release|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.Build.0 = Release|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.ActiveCfg = Release|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.Build.0 = Release|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.ActiveCfg = Debug|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.Build.0 = Debug|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.ActiveCfg = Debug|Win32 diff --git a/src/Samples/bafunctions/bafunctions.rc b/src/Samples/bafunctions/bafunctions.rc deleted file mode 100644 index 9643d240..00000000 --- a/src/Samples/bafunctions/bafunctions.rc +++ /dev/null @@ -1,118 +0,0 @@ -// 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. - -#include -#include -#include "bafunctionsver.h" - -#define VER_APP -#define VER_ORIGINAL_FILENAME "bafunctions.dll" -#define VER_INTERNAL_NAME "bafunctions" -#define VER_PRODUCT_NAME "WiX Sample BAFunctions" -#define VER_FILE_DESCRIPTION "WiX Sample BAFunctions" - -#ifdef DEBUG - #define VER_DEBUG VS_FF_DEBUG - #define VER_PRIVATE_BUILD VS_FF_PRIVATEBUILD - #define VER_PRE_RELEASE (VS_FF_PRERELEASE | VS_FF_SPECIALBUILD) -#else - #define VER_DEBUG 0 - #define VER_PRIVATE_BUILD 0 - #define VER_PRE_RELEASE 0 -#endif - -#if defined(VER_APP) - #define VER_FILE_TYPE VFT_APP -#elif defined(VER_DLL) - #define VER_FILE_TYPE VFT_DLL -#elif defined(VER_TYPELIB) - #define VER_FILE_TYPE VFT_UNKNOWN -#else - #define VER_FILE_TYPE VFT_UNKNOWN -#endif - -#if defined(VER_LANG_NEUTRAL) - #ifndef VER_LANG - #define VER_LANG 0x0000 - #endif - #ifndef VER_CP - #define VER_CP 0x04E4 - #endif - #ifndef VER_BLOCK - #define VER_BLOCK "000004E4" - #endif -#else - #ifndef VER_LANG - #define VER_LANG 0x0409 - #endif - #ifndef VER_CP - #define VER_CP 0x04E4 - #endif - #ifndef VER_BLOCK - #define VER_BLOCK "040904E4" - #endif -#endif - -#define VER_FILE_VERSION rmj, rmm, rbd, rev -#define VER_PRODUCT_VERSION rmj, rmm, rbd, rev -#define VER_FILE_VERSION_STRING szVerMajorMinorBuildRev -#define VER_PRODUCT_VERSION_STRING VER_FILE_VERSION_STRING -#define VER_FILE_FLAGS_MASK VS_FFI_FILEFLAGSMASK -#define VER_FILE_FLAGS (VER_DEBUG | VER_PRIVATE_BUILD | VER_PRE_RELEASE) - -#define VER_FILE_OS VOS__WINDOWS32 - -#define VER_COMPANY_NAME ".NET Foundation" -#ifndef VER_PRODUCT_NAME - #define VER_PRODUCT_NAME "Windows Installer XML (WiX)" -#endif -#ifndef VER_FILE_DESCRIPTION - #define VER_FILE_DESCRIPTION "Windows Installer XML (WiX) component" -#endif - -#if defined(VER_LEGAL_COPYRIGHT) - #error -#endif -#define VER_LEGAL_COPYRIGHT "Copyright (c) .NET Foundation and contributors.\240 All rights reserved." - -#if !defined(VER_FILE_SUBTYPE) - #define VER_FILE_SUBTYPE 0 -#endif - -#ifdef RC_INVOKED - -VS_VERSION_INFO VERSIONINFO -FILEVERSION VER_FILE_VERSION -PRODUCTVERSION VER_PRODUCT_VERSION -FILEFLAGSMASK VER_FILE_FLAGS_MASK -FILEFLAGS VER_FILE_FLAGS -FILEOS VER_FILE_OS -FILETYPE VER_FILE_TYPE -FILESUBTYPE VER_FILE_SUBTYPE -BEGIN -BLOCK "StringFileInfo" - BEGIN - BLOCK VER_BLOCK - BEGIN - VALUE "CompanyName", VER_COMPANY_NAME - VALUE "FileDescription", VER_FILE_DESCRIPTION - VALUE "FileVersion", VER_FILE_VERSION_STRING - VALUE "InternalName", VER_INTERNAL_NAME - - VALUE "LegalCopyright", VER_LEGAL_COPYRIGHT - - VALUE "OriginalFilename", VER_ORIGINAL_FILENAME - VALUE "ProductName", VER_PRODUCT_NAME - VALUE "ProductVersion", VER_FILE_VERSION_STRING -#if defined(DEBUG) - VALUE "WiX Common Resource Format", "Debug Only" -#endif - END - END - -BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", VER_LANG, VER_CP - END -END - -#endif diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 71b27bca..662aa711 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -1,8 +1,11 @@ + + + + - Debug @@ -13,31 +16,27 @@ Win32 - - - Debug - ARM - - - Release - ARM - - + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02} DynamicLibrary + v141 Unicode BAFunctions bafunctions.def - + + + + - $(WixRoot)src\libs\dutil\inc;$(WixRoot)src\burn\inc;$(WixRoot)src\libs\balutil\inc - comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;dutil.lib;balutil.lib;version.lib + comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib - + + Create + @@ -47,8 +46,20 @@ + - + - + + + + + + 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}. + + + + + + diff --git a/src/Samples/bafunctions/bafunctionsver.h b/src/Samples/bafunctions/bafunctionsver.h deleted file mode 100644 index e6e22f4e..00000000 --- a/src/Samples/bafunctions/bafunctionsver.h +++ /dev/null @@ -1,13 +0,0 @@ -// 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. - -#ifndef _VERSION_FILE_H_ -#define _VERSION_FILE_H_ - -#define szVerMajorMinor "1.0" -#define szVerMajorMinorBuildRev "1.0.0.0" -#define rmj 1 -#define rmm 0 -#define rbd 0 -#define rev 0 - -#endif diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config new file mode 100644 index 00000000..41ba2f12 --- /dev/null +++ b/src/Samples/bafunctions/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/Samples/bafunctions/precomp.h b/src/Samples/bafunctions/precomp.h index 82ce2dae..9d2fe726 100644 --- a/src/Samples/bafunctions/precomp.h +++ b/src/Samples/bafunctions/precomp.h @@ -3,7 +3,12 @@ #include + +#pragma warning(push) +#pragma warning(disable:4458) // declaration of 'xxx' hides class member #include +#pragma warning(pop) + #include #include #include -- cgit v1.2.3-55-g6feb From e0d1a8f6e54f2c573fc79fc442518758297b7d80 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 18 Jan 2019 09:06:23 -0600 Subject: Fix build. --- nuget.config | 1 - src/Samples/bafunctions/bafunctions.vcxproj | 2 +- src/mbahost/mbahost.vcxproj | 2 +- src/wixstdba/wixstdba.vcxproj | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/nuget.config b/nuget.config index 52b04261..06a49261 100644 --- a/nuget.config +++ b/nuget.config @@ -13,7 +13,6 @@ - \ No newline at end of file diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 662aa711..8bc34cf8 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -3,7 +3,7 @@ - + diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index d40333ab..7d6cdc20 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -3,7 +3,7 @@ - + diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 8ee9ace9..15d5bbd6 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -3,7 +3,7 @@ - + -- cgit v1.2.3-55-g6feb From 391057093e45db2d4b2450bd236b9e1fc4cfd53c Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 13 Feb 2019 20:13:57 -0600 Subject: Add test for creating a Managed BA through mbahost. --- Bal.wixext.sln | 10 +++ src/Cpp.Build.props | 10 +-- .../BootstrapperApplicationData.xml | Bin 0 -> 20128 bytes src/test/WixToolsetTest.MbaHost/EngineForTest.cpp | 45 ++++++++++ src/test/WixToolsetTest.MbaHost/EngineForTest.h | 63 ++++++++++++++ src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp | 70 ++++++++++++++++ .../TestManagedBootstrapperApplication.h | 30 +++++++ .../WixToolset.BootstrapperCore.config | 26 ++++++ .../WixToolsetTest.MbaHost.vcxproj | 91 +++++++++++++++++++++ src/test/WixToolsetTest.MbaHost/packages.config | 14 ++++ src/test/WixToolsetTest.MbaHost/precomp.cpp | 3 + src/test/WixToolsetTest.MbaHost/precomp.h | 15 ++++ 12 files changed, 371 insertions(+), 6 deletions(-) create mode 100644 src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml create mode 100644 src/test/WixToolsetTest.MbaHost/EngineForTest.cpp create mode 100644 src/test/WixToolsetTest.MbaHost/EngineForTest.h create mode 100644 src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp create mode 100644 src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h create mode 100644 src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config create mode 100644 src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj create mode 100644 src/test/WixToolsetTest.MbaHost/packages.config create mode 100644 src/test/WixToolsetTest.MbaHost/precomp.cpp create mode 100644 src/test/WixToolsetTest.MbaHost/precomp.h (limited to 'src') diff --git a/Bal.wixext.sln b/Bal.wixext.sln index 38041e89..e84aab6f 100644 --- a/Bal.wixext.sln +++ b/Bal.wixext.sln @@ -13,6 +13,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixpr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixToolsetTest.MbaHost", "src\test\WixToolsetTest.MbaHost\WixToolsetTest.MbaHost.vcxproj", "{8C131CB9-7B1C-4B06-A328-E69CE9EDC763}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -61,6 +63,14 @@ Global {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.Build.0 = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.ActiveCfg = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.Build.0 = Release|Any CPU + {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|Any CPU.Build.0 = Debug|Win32 + {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|x86.ActiveCfg = Debug|Win32 + {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|x86.Build.0 = Debug|Win32 + {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|Any CPU.ActiveCfg = Release|Win32 + {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|Any CPU.Build.0 = Release|Win32 + {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|x86.ActiveCfg = Release|Win32 + {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 0e00132b..a90fec2c 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -11,6 +11,10 @@ $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + + 4564;4691 + @@ -95,10 +99,4 @@ MultiThreadedDll - - - $(LinkKeyFile) - $(LinkDelaySign) - - diff --git a/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml b/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml new file mode 100644 index 00000000..7c4169b1 Binary files /dev/null and b/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml differ diff --git a/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp b/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp new file mode 100644 index 00000000..b2567a7b --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp @@ -0,0 +1,45 @@ +// 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. + +#include "precomp.h" + +static HRESULT BAEngineLog( + __in BOOTSTRAPPER_ENGINE_CONTEXT* pContext, + __in BAENGINE_LOG_ARGS* pArgs, + __in BAENGINE_LOG_RESULTS* /*pResults*/ +) +{ + HRESULT hr = S_OK; + + pContext->pfnLog(pArgs->wzMessage); + + return hr; +} + +HRESULT WINAPI EngineForTestProc( + __in BOOTSTRAPPER_ENGINE_MESSAGE message, + __in const LPVOID pvArgs, + __inout LPVOID pvResults, + __in_opt LPVOID pvContext +) +{ + HRESULT hr = S_OK; + BOOTSTRAPPER_ENGINE_CONTEXT* pContext = reinterpret_cast(pvContext); + + if (!pContext || !pvArgs || !pvResults) + { + ExitFunction1(hr = E_INVALIDARG); + } + + switch (message) + { + case BOOTSTRAPPER_ENGINE_MESSAGE_LOG: + hr = BAEngineLog(pContext, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + default: + hr = E_NOTIMPL; + break; + } + +LExit: + return hr; +} \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/EngineForTest.h b/src/test/WixToolsetTest.MbaHost/EngineForTest.h new file mode 100644 index 00000000..6058e67c --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/EngineForTest.h @@ -0,0 +1,63 @@ +#pragma once +// 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. + +HRESULT WINAPI EngineForTestProc( + __in BOOTSTRAPPER_ENGINE_MESSAGE message, + __in const LPVOID pvArgs, + __inout LPVOID pvResults, + __in_opt LPVOID pvContext +); + +typedef void(WINAPI *PFN_TEST_LOG_PROC)( + __in LPCWSTR sczMessage + ); + +struct BOOTSTRAPPER_ENGINE_CONTEXT +{ + PFN_TEST_LOG_PROC pfnLog; +}; + +namespace WixToolsetTest +{ +namespace MbaHost +{ +namespace Native +{ + using namespace System; + using namespace System::Collections::Generic; + using namespace System::Runtime::InteropServices; + + public ref class EngineForTest + { + private: + delegate void LogDelegate(LPCWSTR); + LogDelegate^ _logDelegate; + List^ _messages; + + void Log(LPCWSTR sczMessage) + { + String^ message = gcnew String(sczMessage); + System::Diagnostics::Debug::WriteLine(message); + _messages->Add(message); + } + public: + EngineForTest() + { + _logDelegate = gcnew LogDelegate(this, &EngineForTest::Log); + _messages = gcnew List(); + } + + List^ GetLogMessages() + { + return _messages; + } + + PFN_TEST_LOG_PROC GetTestLogProc() + { + IntPtr functionPointer = Marshal::GetFunctionPointerForDelegate(_logDelegate); + return static_cast(functionPointer.ToPointer()); + } + }; +} +} +} \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp b/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp new file mode 100644 index 00000000..9328aacf --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp @@ -0,0 +1,70 @@ +// 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. + +#include "precomp.h" + +namespace WixToolsetTest +{ +namespace MbaHost +{ +namespace Native +{ + using namespace System; + using namespace Xunit; + + public ref class MbaHostFixture + { + public: + [Fact] + void CanLoadManagedBootstrapperApplication() + { + HMODULE hBAModule = NULL; + PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL; + HRESULT hr = S_OK; + + EngineForTest^ engine = gcnew EngineForTest(); + BOOTSTRAPPER_ENGINE_CONTEXT engineContext = { }; + engineContext.pfnLog = engine->GetTestLogProc(); + + LogInitialize(::GetModuleHandleW(NULL)); + + hr = LogOpen(NULL, L"MbaHostUnitTest", NULL, L"txt", FALSE, FALSE, NULL); + Assert::Equal(S_OK, hr); + + BOOTSTRAPPER_COMMAND command = { }; + BOOTSTRAPPER_CREATE_ARGS args = { }; + BOOTSTRAPPER_CREATE_RESULTS results = { }; + + args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS); + args.pCommand = &command; + args.pfnBootstrapperEngineProc = EngineForTestProc; + args.pvBootstrapperEngineProcContext = &engineContext; + args.qwEngineAPIVersion = MAKEQWORDVERSION(0, 0, 0, 1); + + results.cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); + + hBAModule = ::LoadLibraryExW(L"mbahost.dll", NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + Assert::NotEqual(NULL, (int)hBAModule); + + pfnCreate = (PFN_BOOTSTRAPPER_APPLICATION_CREATE)::GetProcAddress(hBAModule, "BootstrapperApplicationCreate"); + Assert::NotEqual(NULL, (int)pfnCreate); + + hr = pfnCreate(&args, &results); + Assert::Equal(S_OK, hr); + + BA_ONSHUTDOWN_ARGS shutdownArgs = { }; + BA_ONSHUTDOWN_RESULTS shutdownResults = { }; + shutdownArgs.cbSize = sizeof(BA_ONSHUTDOWN_ARGS); + shutdownResults.action = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER; + shutdownResults.cbSize = sizeof(BA_ONSHUTDOWN_RESULTS); + hr = results.pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN, &shutdownArgs, &shutdownResults, results.pvBootstrapperApplicationProcContext); + Assert::Equal(S_OK, hr); + + List^ logMessages = engine->GetLogMessages(); + Assert::Equal(2, logMessages->Count); + Assert::Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert::Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]); + } + }; +} +} +} diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h new file mode 100644 index 00000000..1dfd0d4d --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h @@ -0,0 +1,30 @@ +#pragma once +// 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. + +namespace WixToolsetTest +{ +namespace MbaHost +{ +namespace Native +{ + using namespace System; + using namespace WixToolset::BootstrapperCore; + + public ref class TestManagedBootstrapperApplication : BootstrapperApplication + { + public: + virtual void Run() override + { + } + + virtual void OnShutdown(ShutdownEventArgs^ e) override + { + String^ message = "Shutdown," + e->Action.ToString() + "," + e->HResult.ToString(); + this->Engine->Log(LogLevel::Standard, message); + } + }; + + [assembly:BootstrapperApplication(TestManagedBootstrapperApplication::typeid)]; +} +} +} \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config b/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config new file mode 100644 index 00000000..b4c67a82 --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config @@ -0,0 +1,26 @@ + + + + + + + +
+ + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj new file mode 100644 index 00000000..557aaff0 --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj @@ -0,0 +1,91 @@ + + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} + {8C131CB9-7B1C-4B06-A328-E69CE9EDC763} + WixToolsetTest.MbaHost + ManagedCProj + DynamicLibrary + v141 + Unicode + true + v4.6.1 + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + ..\..\..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll + + + ..\..\..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll + + + ..\..\..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll + + + ..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll + + + ..\..\..\packages\WixToolset.BootstrapperCore.4.0.3\lib\net20\WixToolset.BootstrapperCore.dll + + + + + {12c87c77-3547-44f8-8134-29bc915cb19d} + + + + + + + + + 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/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config new file mode 100644 index 00000000..c3b6551c --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/packages.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/precomp.cpp b/src/test/WixToolsetTest.MbaHost/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/precomp.cpp @@ -0,0 +1,3 @@ +// 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. + +#include "precomp.h" diff --git a/src/test/WixToolsetTest.MbaHost/precomp.h b/src/test/WixToolsetTest.MbaHost/precomp.h new file mode 100644 index 00000000..aa4b6ddc --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/precomp.h @@ -0,0 +1,15 @@ +#pragma once +// 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. + + +#include +#include + +#include "dutil.h" +#include "logutil.h" + +#include "BootstrapperEngine.h" +#include "BootstrapperApplication.h" + +#include "EngineForTest.h" +#include "TestManagedBootstrapperApplication.h" -- cgit v1.2.3-55-g6feb From 1144983d580524f1e22e0ddd2416955cda8063d2 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 15 Feb 2019 19:08:58 -0600 Subject: WIXFEAT:3815 - Update mbahost test for BootstrapperApplicationFactoryAttribute. --- .../TestManagedBootstrapperApplication.h | 8 +++++-- .../TestManagedBootstrapperApplicationFactory.h | 25 ++++++++++++++++++++++ .../WixToolsetTest.MbaHost.vcxproj | 7 +++--- src/test/WixToolsetTest.MbaHost/packages.config | 2 +- src/test/WixToolsetTest.MbaHost/precomp.h | 1 + 5 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h (limited to 'src') diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h index 1dfd0d4d..d74d90c5 100644 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h @@ -13,6 +13,12 @@ namespace Native public ref class TestManagedBootstrapperApplication : BootstrapperApplication { public: + TestManagedBootstrapperApplication(WixToolset::BootstrapperCore::Engine^ engine, WixToolset::BootstrapperCore::Command command) + : BootstrapperApplication(engine, command) + { + + } + virtual void Run() override { } @@ -23,8 +29,6 @@ namespace Native this->Engine->Log(LogLevel::Standard, message); } }; - - [assembly:BootstrapperApplication(TestManagedBootstrapperApplication::typeid)]; } } } \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h new file mode 100644 index 00000000..9d44075b --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h @@ -0,0 +1,25 @@ +#pragma once +// 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. + +namespace WixToolsetTest +{ +namespace MbaHost +{ +namespace Native +{ + using namespace System; + using namespace WixToolset::BootstrapperCore; + + public ref class TestManagedBootstrapperApplicationFactory : public BaseBootstrapperApplicationFactory + { + protected: + virtual IBootstrapperApplication^ Create(Engine^ engine, Command% command) override + { + return gcnew TestManagedBootstrapperApplication(engine, command); + } + }; + + [assembly:BootstrapperApplicationFactory(TestManagedBootstrapperApplicationFactory::typeid)]; +} +} +} \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj index 557aaff0..a95a1606 100644 --- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj +++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj @@ -2,7 +2,7 @@ - + @@ -42,6 +42,7 @@ + @@ -65,7 +66,7 @@ ..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll - ..\..\..\packages\WixToolset.BootstrapperCore.4.0.3\lib\net20\WixToolset.BootstrapperCore.dll + ..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\lib\net20\WixToolset.BootstrapperCore.dll @@ -82,7 +83,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}. - + diff --git a/src/test/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config index c3b6551c..d534f781 100644 --- a/src/test/WixToolsetTest.MbaHost/packages.config +++ b/src/test/WixToolsetTest.MbaHost/packages.config @@ -9,6 +9,6 @@ - + \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/precomp.h b/src/test/WixToolsetTest.MbaHost/precomp.h index aa4b6ddc..7c451c03 100644 --- a/src/test/WixToolsetTest.MbaHost/precomp.h +++ b/src/test/WixToolsetTest.MbaHost/precomp.h @@ -13,3 +13,4 @@ #include "EngineForTest.h" #include "TestManagedBootstrapperApplication.h" +#include "TestManagedBootstrapperApplicationFactory.h" -- cgit v1.2.3-55-g6feb From f1b3a32900dbb7d7f7f4db3d1aedcf63db5ede58 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 15 Feb 2019 22:05:39 -0600 Subject: WIXFEAT:3815 - Update mbahost test for updates to BaseBootstrapperApplicationFactory and BootstrapperApplication. --- .../WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h | 6 +++--- .../TestManagedBootstrapperApplicationFactory.h | 4 ++-- src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj | 6 +++--- src/test/WixToolsetTest.MbaHost/packages.config | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h index d74d90c5..910d39bd 100644 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h @@ -13,8 +13,8 @@ namespace Native public ref class TestManagedBootstrapperApplication : BootstrapperApplication { public: - TestManagedBootstrapperApplication(WixToolset::BootstrapperCore::Engine^ engine, WixToolset::BootstrapperCore::Command command) - : BootstrapperApplication(engine, command) + TestManagedBootstrapperApplication(WixToolset::BootstrapperCore::IEngine^ engine) + : BootstrapperApplication(engine) { } @@ -26,7 +26,7 @@ namespace Native virtual void OnShutdown(ShutdownEventArgs^ e) override { String^ message = "Shutdown," + e->Action.ToString() + "," + e->HResult.ToString(); - this->Engine->Log(LogLevel::Standard, message); + this->engine->Log(LogLevel::Standard, message); } }; } diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h index 9d44075b..0f30ff2d 100644 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h @@ -13,9 +13,9 @@ namespace Native public ref class TestManagedBootstrapperApplicationFactory : public BaseBootstrapperApplicationFactory { protected: - virtual IBootstrapperApplication^ Create(Engine^ engine, Command% command) override + virtual IBootstrapperApplication^ Create(IEngine^ engine, IBootstrapperCommand^ /*command*/) override { - return gcnew TestManagedBootstrapperApplication(engine, command); + return gcnew TestManagedBootstrapperApplication(engine); } }; diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj index a95a1606..094c351f 100644 --- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj +++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj @@ -2,7 +2,7 @@ - + @@ -66,7 +66,7 @@ ..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll - ..\..\..\packages\WixToolset.BootstrapperCore.4.0.4\lib\net20\WixToolset.BootstrapperCore.dll + ..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\lib\net20\WixToolset.BootstrapperCore.dll @@ -83,7 +83,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}. - + diff --git a/src/test/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config index d534f781..4cd75692 100644 --- a/src/test/WixToolsetTest.MbaHost/packages.config +++ b/src/test/WixToolsetTest.MbaHost/packages.config @@ -9,6 +9,6 @@ - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 47a534556c70f97cdbff7e9b64c0e6e86173e22b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 11 Dec 2019 11:37:27 +1100 Subject: Update to latest repo-template. --- src/Cpp.Build.props | 2 +- src/Directory.Build.props | 4 +++- src/FindLocalWix.props | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index a90fec2c..864f0fcd 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -8,7 +8,7 @@ $(OutputPath)$(Platform)\ - + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e853e22d..a22f4470 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -8,6 +8,7 @@ Debug false + MSB3246 $(MSBuildProjectName) $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) @@ -21,6 +22,7 @@ WiX Toolset - + + diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props index a784e352..1666e4fe 100644 --- a/src/FindLocalWix.props +++ b/src/FindLocalWix.props @@ -3,6 +3,6 @@ - $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets + $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets -- cgit v1.2.3-55-g6feb From a70d814e7db6a7c4956423bca3bfdd23abc433bc Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 11 Dec 2019 16:22:58 +1100 Subject: Bring extension up to date. --- src/Samples/bafunctions/bafunctions.vcxproj | 12 ++-- src/Samples/bafunctions/packages.config | 6 +- src/mbahost/mbahost.vcxproj | 12 ++-- src/mbahost/packages.config | 6 +- .../WixToolsetTest.MbaHost.vcxproj | 8 +-- src/test/WixToolsetTest.MbaHost/packages.config | 4 +- src/wixext/BalCompiler.cs | 70 +++++++++++----------- .../BalWindowsInstallerBackendBinderExtension.cs | 16 +++-- src/wixlib/bal.wixproj | 4 +- src/wixlib/packages.config | 2 +- src/wixstdba/packages.config | 6 +- src/wixstdba/wixstdba.vcxproj | 12 ++-- 12 files changed, 78 insertions(+), 80 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 8bc34cf8..e4988019 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -57,9 +57,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 41ba2f12..107f25c4 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 7d6cdc20..7e00b60b 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -56,9 +56,9 @@ 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}. - - - + + + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 41ba2f12..107f25c4 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj index 094c351f..854bc6cf 100644 --- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj +++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj @@ -1,10 +1,10 @@ - + - + Debug @@ -82,11 +82,11 @@ 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/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config index 4cd75692..466226a5 100644 --- a/src/test/WixToolsetTest.MbaHost/packages.config +++ b/src/test/WixToolsetTest.MbaHost/packages.config @@ -8,7 +8,7 @@ - + - + \ No newline at end of file diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 5b54ef58..c9b232ba 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -110,7 +110,7 @@ namespace WixToolset.Bal if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixMbaPrereqInformation"); + prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixMbaPrereqInformation"); prereqInfo.PackageId = packageId; this.prereqInfoRows.Add(packageId, prereqInfo); @@ -141,7 +141,7 @@ namespace WixToolset.Bal if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixMbaPrereqInformation"); + prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixMbaPrereqInformation"); prereqInfo.PackageId = packageId; this.prereqInfoRows.Add(packageId, prereqInfo); @@ -167,7 +167,7 @@ namespace WixToolset.Bal { if (!this.prereqInfoRows.TryGetValue(packageId, out prereqInfo)) { - prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixMbaPrereqInformation"); + prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixMbaPrereqInformation"); prereqInfo.PackageId = packageId; this.prereqInfoRows.Add(packageId, prereqInfo); @@ -193,7 +193,7 @@ namespace WixToolset.Bal case "BAFunctions": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - var tuple = (WixBalBAFunctionsTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBalBAFunctions"); + var tuple = (WixBalBAFunctionsTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBalBAFunctions"); tuple.PayloadId = payloadId; } break; @@ -218,7 +218,7 @@ namespace WixToolset.Bal case "Overridable": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - var tuple = (WixStdbaOverridableVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixStdbaOverridableVariable"); + var tuple = (WixStdbaOverridableVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixStdbaOverridableVariable"); tuple.Name = variableName.Value; } break; @@ -276,7 +276,7 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { - var tuple = (WixBalConditionTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBalCondition"); + var tuple = (WixBalConditionTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBalCondition"); tuple.Condition = condition; tuple.Message = message; @@ -387,32 +387,32 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(launchTarget)) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable"); - row.Id = new Identifier("LaunchTarget", AccessModifier.Public); + var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable"); + row.Id = new Identifier(AccessModifier.Public, "LaunchTarget"); row.Value = launchTarget; row.Type = "string"; } if (!String.IsNullOrEmpty(launchTargetElevatedId)) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable"); - row.Id = new Identifier("LaunchTargetElevatedId", AccessModifier.Public); + var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable"); + row.Id = new Identifier(AccessModifier.Public, "LaunchTargetElevatedId"); row.Value = launchTargetElevatedId; row.Type = "string"; } if (!String.IsNullOrEmpty(launchArguments)) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable"); - row.Id = new Identifier("LaunchArguments", AccessModifier.Public); + var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable"); + row.Id = new Identifier(AccessModifier.Public, "LaunchArguments"); row.Value = launchArguments; row.Type = "string"; } if (YesNoType.Yes == launchHidden) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixBundleVariable"); - row.Id = new Identifier("LaunchHidden", AccessModifier.Public); + var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable"); + row.Id = new Identifier(AccessModifier.Public, "LaunchHidden"); row.Value = "yes"; row.Type = "string"; } @@ -420,57 +420,57 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchWorkingDir)) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "Variable"); - row.Id = new Identifier("LaunchWorkingFolder", AccessModifier.Public); + var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Variable"); + row.Id = new Identifier(AccessModifier.Public, "LaunchWorkingFolder"); row.Value = launchWorkingDir; row.Type = "string"; } if (!String.IsNullOrEmpty(licenseFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier("WixStdbaLicenseRtf", AccessModifier.Public); + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf"); wixVariableRow.Value = licenseFile; } if (null != licenseUrl) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier("WixStdbaLicenseUrl", AccessModifier.Public); + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl"); wixVariableRow.Value = licenseUrl; } if (!String.IsNullOrEmpty(logoFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier("WixStdbaLogo", AccessModifier.Public); + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLogo"); wixVariableRow.Value = logoFile; } if (!String.IsNullOrEmpty(logoSideFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier("WixStdbaLogoSide", AccessModifier.Public); + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLogoSide"); wixVariableRow.Value = logoSideFile; } if (!String.IsNullOrEmpty(themeFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier("WixStdbaThemeXml", AccessModifier.Public); + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaThemeXml"); wixVariableRow.Value = themeFile; } if (!String.IsNullOrEmpty(localizationFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier("WixStdbaThemeWxl", AccessModifier.Public); + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaThemeWxl"); wixVariableRow.Value = localizationFile; } if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly) { - var tuple = (WixStdbaOptionsTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixStdbaOptions"); + var tuple = (WixStdbaOptionsTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixStdbaOptions"); if (YesNoType.Yes == suppressOptionsUI) { tuple.SuppressOptionsUI = 1; @@ -542,22 +542,22 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(logoFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier("PreqbaLogo", AccessModifier.Public); + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier(AccessModifier.Public, "PreqbaLogo"); wixVariableRow.Value = logoFile; } if (!String.IsNullOrEmpty(themeFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier("PreqbaThemeXml", AccessModifier.Public); + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier(AccessModifier.Public, "PreqbaThemeXml"); wixVariableRow.Value = themeFile; } if (!String.IsNullOrEmpty(localizationFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateRow(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier("PreqbaThemeWxl", AccessModifier.Public); + var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); + wixVariableRow.Id = new Identifier(AccessModifier.Public, "PreqbaThemeWxl"); wixVariableRow.Value = localizationFile; } } diff --git a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs index fbda9d1b..3dc00da6 100644 --- a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs +++ b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs @@ -6,6 +6,7 @@ namespace WixToolset.Bal using System.Linq; using System.Xml; using WixToolset.Data; + using WixToolset.Data.Burn; using WixToolset.Data.WindowsInstaller; using WixToolset.Data.WindowsInstaller.Rows; using WixToolset.Extensibility; @@ -13,9 +14,6 @@ namespace WixToolset.Bal public class BalWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension { - // TODO: don't duplicate this from WixToolset.Core.Compiler - public const string BurnUXContainerId = "WixUXContainer"; - private static readonly TableDefinition[] Tables = LoadTables(); protected override TableDefinition[] TableDefinitionsForTuples => Tables; @@ -30,11 +28,11 @@ namespace WixToolset.Bal } } - public override void PostBackendBind(BindResult result, Pdb pdb) + public override void PostBackendBind(IBindResult result, WixOutput wixout) { - base.PostBackendBind(result, pdb); + base.PostBackendBind(result, wixout); - var output = pdb.Output; + var output = WindowsInstallerData.Load(wixout.Uri.AbsoluteUri, false); // Only process Bundles. if (OutputType.Bundle != output.Type) @@ -64,7 +62,7 @@ namespace WixToolset.Bal } } - private void VerifyBAFunctions(Output output) + private void VerifyBAFunctions(WindowsInstallerData output) { Row baFunctionsRow = null; var baFunctionsTable = output.Tables["WixBalBAFunctions"]; @@ -98,14 +96,14 @@ namespace WixToolset.Bal // TODO: May need to revisit this depending on the outcome of #5273. var payloadId = (string)baFunctionsRow[0]; var bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id); - if (BurnUXContainerId != bundlePayloadRow.Container) + if (BurnConstants.BurnUXContainerName != bundlePayloadRow.Container) { this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers)); } } } - private void VerifyPrereqPackages(Output output) + private void VerifyPrereqPackages(WindowsInstallerData output) { var prereqInfoTable = output.Tables["WixMbaPrereqInformation"]; if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0) diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index be15229b..875283f9 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,7 +1,7 @@ - + {3444D952-F21C-496F-AB6B-56435BFD0787} @@ -56,7 +56,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}. - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 7964daed..3ba2b904 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 41ba2f12..107f25c4 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 15d5bbd6..8f3b4204 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -107,9 +107,9 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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}. - - - + + + -- cgit v1.2.3-55-g6feb From 58243de7b503690d8794d6a7479cd49c370639f4 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 11 Dec 2019 16:23:43 +1100 Subject: Compile bundle authoring in the wixlib. --- src/mbahost/mbahost.vcxproj | 8 +++++++ src/wixlib/Mba.wxs | 54 +++++++++++++++++++++---------------------- src/wixlib/NetFx4AsPrereq.wxs | 2 +- src/wixlib/bal.wixproj | 9 +++++--- src/wixlib/caSuffix.wxi | 28 ++++++++++++++++++++++ src/wixlib/wixstdba.wxs | 2 +- 6 files changed, 71 insertions(+), 32 deletions(-) create mode 100644 src/wixlib/caSuffix.wxi (limited to 'src') diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 7e00b60b..ff486d54 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -50,6 +50,10 @@ + + + + @@ -61,4 +65,8 @@ + + + + diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs index 6f18bf51..dab533ca 100644 --- a/src/wixlib/Mba.wxs +++ b/src/wixlib/Mba.wxs @@ -40,39 +40,39 @@ - + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/NetFx4AsPrereq.wxs b/src/wixlib/NetFx4AsPrereq.wxs index 83fc8e35..9b7437e5 100644 --- a/src/wixlib/NetFx4AsPrereq.wxs +++ b/src/wixlib/NetFx4AsPrereq.wxs @@ -62,7 +62,7 @@ - + diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 875283f9..fbac3baa 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -14,7 +14,6 @@ - + + + + + @@ -33,7 +36,7 @@ - + diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi new file mode 100644 index 00000000..a56a2393 --- /dev/null +++ b/src/wixlib/caSuffix.wxi @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs index b0476fe2..5c99747d 100644 --- a/src/wixlib/wixstdba.wxs +++ b/src/wixlib/wixstdba.wxs @@ -85,7 +85,7 @@ - + -- cgit v1.2.3-55-g6feb From 1ee38ea389f84217d13dd707208e4ec6e332a507 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 11 Dec 2019 20:58:44 +1100 Subject: Update dependencies. --- src/Samples/bafunctions/bafunctions.vcxproj | 8 +++---- src/Samples/bafunctions/packages.config | 4 ++-- src/mbahost/mbahost.cpp | 6 ++--- src/mbahost/mbahost.vcxproj | 17 +++++++++----- src/mbahost/packages.config | 6 +++-- .../TestManagedBootstrapperApplication.h | 3 ++- .../TestManagedBootstrapperApplicationFactory.h | 2 +- .../WixToolset.BootstrapperCore.config | 26 ---------------------- .../WixToolset.Mba.Core.config | 26 ++++++++++++++++++++++ .../WixToolsetTest.MbaHost.vcxproj | 15 ++++++++----- src/test/WixToolsetTest.MbaHost/packages.config | 6 +++-- src/wixlib/Mba.wxs | 1 + src/wixstdba/packages.config | 4 ++-- src/wixstdba/wixstdba.vcxproj | 8 +++---- 14 files changed, 74 insertions(+), 58 deletions(-) delete mode 100644 src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config create mode 100644 src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index e4988019..5550ff60 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -57,8 +57,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 107f25c4..7c46d4c5 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.cpp b/src/mbahost/mbahost.cpp index d3737c06..444a95a8 100644 --- a/src/mbahost/mbahost.cpp +++ b/src/mbahost/mbahost.cpp @@ -1,7 +1,7 @@ // 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. #include "precomp.h" -#include // includes the generated assembly name macros. +#include // includes the generated assembly name macros. #include "BalBaseBootstrapperApplicationProc.h" static const DWORD NET452_RELEASE = 379893; @@ -185,7 +185,7 @@ static HRESULT GetAppDomain( hr = GetAppBase(&sczAppBase); ExitOnFailure(hr, "Failed to get the host base path."); - hr = PathConcat(sczAppBase, L"WixToolset.BootstrapperCore.config", &sczConfigPath); + hr = PathConcat(sczAppBase, L"WixToolset.Mba.Core.config", &sczConfigPath); ExitOnFailure(hr, "Failed to get the full path to the application configuration file."); // Check that the supported framework is installed. @@ -557,7 +557,7 @@ static HRESULT CreateManagedBootstrapperApplicationFactory( bstrAssemblyName = ::SysAllocString(MBA_ASSEMBLY_FULL_NAME); ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory."); - bstrTypeName = ::SysAllocString(L"WixToolset.BootstrapperCore.BootstrapperApplicationFactory"); + bstrTypeName = ::SysAllocString(L"WixToolset.Mba.Core.BootstrapperApplicationFactory"); ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory."); hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj); diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index ff486d54..c7a0b69f 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -50,8 +50,15 @@ + + + ..\..\packages\WixToolset.Mba.Core.4.0.9\build\native\include\;%(AdditionalIncludeDirectories) + + + - + + @@ -60,8 +67,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}. - - + + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 107f25c4..c616685e 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,7 +1,9 @@  - - + + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h index 910d39bd..8142b26c 100644 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h @@ -9,11 +9,12 @@ namespace Native { using namespace System; using namespace WixToolset::BootstrapperCore; + using namespace WixToolset::Mba::Core; public ref class TestManagedBootstrapperApplication : BootstrapperApplication { public: - TestManagedBootstrapperApplication(WixToolset::BootstrapperCore::IEngine^ engine) + TestManagedBootstrapperApplication(WixToolset::Mba::Core::IEngine^ engine) : BootstrapperApplication(engine) { diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h index 0f30ff2d..86f6e3cb 100644 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h @@ -8,7 +8,7 @@ namespace MbaHost namespace Native { using namespace System; - using namespace WixToolset::BootstrapperCore; + using namespace WixToolset::Mba::Core; public ref class TestManagedBootstrapperApplicationFactory : public BaseBootstrapperApplicationFactory { diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config b/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config deleted file mode 100644 index b4c67a82..00000000 --- a/src/test/WixToolsetTest.MbaHost/WixToolset.BootstrapperCore.config +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config b/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config new file mode 100644 index 00000000..18bfbfc2 --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config @@ -0,0 +1,26 @@ + + + + + + + +
+ + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj index 854bc6cf..b82f9194 100644 --- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj +++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -48,7 +48,7 @@ - + @@ -66,7 +66,10 @@ ..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll - ..\..\..\packages\WixToolset.BootstrapperCore.4.0.5\lib\net20\WixToolset.BootstrapperCore.dll + ..\..\..\packages\WixToolset.BootstrapperCore.4.0.8\lib\net20\WixToolset.BootstrapperCore.dll + + + ..\..\..\packages\WixToolset.Mba.Core.4.0.9\lib\net20\WixToolset.Mba.Core.dll @@ -82,8 +85,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}. - - + + diff --git a/src/test/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config index 466226a5..c0615f19 100644 --- a/src/test/WixToolsetTest.MbaHost/packages.config +++ b/src/test/WixToolsetTest.MbaHost/packages.config @@ -8,7 +8,9 @@ - - + + + + \ No newline at end of file diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs index dab533ca..05b57100 100644 --- a/src/wixlib/Mba.wxs +++ b/src/wixlib/Mba.wxs @@ -41,6 +41,7 @@ + diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 107f25c4..7c46d4c5 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 8f3b4204..c3d3ede7 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -107,8 +107,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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}. - - + + -- cgit v1.2.3-55-g6feb From 43fb611edc680a74d229e8f1eeacb30adad8e3c7 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 21 Dec 2019 18:33:23 +1100 Subject: Move the entry point from Mba.Core to Mba.Host. --- Bal.wixext.sln | 14 +- appveyor.cmd | 1 + src/Samples/bafunctions/bafunctions.vcxproj | 8 +- src/Samples/bafunctions/packages.config | 4 +- .../BootstrapperApplicationFactory.cs | 85 ++++++++++++ .../BootstrapperSectionGroup.cs | 29 +++++ src/WixToolset.Mba.Host/Exceptions.cs | 145 +++++++++++++++++++++ src/WixToolset.Mba.Host/HostSection.cs | 47 +++++++ src/WixToolset.Mba.Host/NativeMethods.cs | 18 +++ src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs | 17 +++ .../SupportedFrameworkElement.cs | 47 +++++++ .../SupportedFrameworkElementCollection.cs | 36 +++++ src/WixToolset.Mba.Host/WixToolset.Mba.Host.config | 26 ++++ src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 89 +++++++++++++ src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | 20 +++ src/WixToolset.Mba.Host/packages.config | 5 + src/mbahost/mbahost.cpp | 19 +-- src/mbahost/mbahost.vcxproj | 21 ++- src/mbahost/packages.config | 6 +- .../TestManagedBootstrapperApplication.h | 1 - .../WixToolset.Mba.Core.config | 26 ---- .../WixToolset.Mba.Host.config | 26 ++++ .../WixToolsetTest.MbaHost.vcxproj | 18 +-- src/test/WixToolsetTest.MbaHost/packages.config | 7 +- src/wixlib/Mba.wxs | 3 +- src/wixstdba/packages.config | 4 +- src/wixstdba/wixstdba.vcxproj | 8 +- 27 files changed, 644 insertions(+), 86 deletions(-) create mode 100644 src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs create mode 100644 src/WixToolset.Mba.Host/BootstrapperSectionGroup.cs create mode 100644 src/WixToolset.Mba.Host/Exceptions.cs create mode 100644 src/WixToolset.Mba.Host/HostSection.cs create mode 100644 src/WixToolset.Mba.Host/NativeMethods.cs create mode 100644 src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs create mode 100644 src/WixToolset.Mba.Host/SupportedFrameworkElement.cs create mode 100644 src/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs create mode 100644 src/WixToolset.Mba.Host/WixToolset.Mba.Host.config create mode 100644 src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj create mode 100644 src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec create mode 100644 src/WixToolset.Mba.Host/packages.config delete mode 100644 src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config create mode 100644 src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config (limited to 'src') diff --git a/Bal.wixext.sln b/Bal.wixext.sln index e84aab6f..867beef5 100644 --- a/Bal.wixext.sln +++ b/Bal.wixext.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.28010.2016 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29503.13 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}" EndProject @@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "sr EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixToolsetTest.MbaHost", "src\test\WixToolsetTest.MbaHost\WixToolsetTest.MbaHost.vcxproj", "{8C131CB9-7B1C-4B06-A328-E69CE9EDC763}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -71,6 +73,14 @@ Global {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|Any CPU.Build.0 = Release|Win32 {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|x86.ActiveCfg = Release|Win32 {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|x86.Build.0 = Release|Win32 + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.ActiveCfg = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.Build.0 = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.Build.0 = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.ActiveCfg = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/appveyor.cmd b/appveyor.cmd index c75d03ea..d3acaadb 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -8,6 +8,7 @@ msbuild -p:Configuration=Release -t:Restore msbuild -p:Configuration=Release msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Bal.wixext.csproj +msbuild -p:Configuration=Release -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj @popd @endlocal \ No newline at end of file diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 5550ff60..22be1a35 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -57,8 +57,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 7c46d4c5..f209d5fb 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs b/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs new file mode 100644 index 00000000..9385d1d1 --- /dev/null +++ b/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs @@ -0,0 +1,85 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + using System.Reflection; + using System.Runtime.InteropServices; + using WixToolset.Mba.Core; + + /// + /// Entry point for the MBA host to create and return the BA to the engine. + /// + [ClassInterface(ClassInterfaceType.None)] + public sealed class BootstrapperApplicationFactory : MarshalByRefObject, IBootstrapperApplicationFactory + { + /// + /// Creates a new instance of the class. + /// + public BootstrapperApplicationFactory() + { + } + + /// + /// Loads the bootstrapper application assembly and calls its IBootstrapperApplicationFactory.Create method. + /// + /// Pointer to BOOTSTRAPPER_CREATE_ARGS struct. + /// Pointer to BOOTSTRAPPER_CREATE_RESULTS struct. + /// The bootstrapper application assembly + /// does not define the . + public void Create(IntPtr pArgs, IntPtr pResults) + { + // Get the wix.boostrapper section group to get the name of the bootstrapper application assembly to host. + var section = ConfigurationManager.GetSection("wix.bootstrapper/host") as HostSection; + if (null == section) + { + throw new MissingAttributeException(); // TODO: throw a more specific exception than this. + } + + // Load the BA's IBootstrapperApplicationFactory. + var baFactoryType = BootstrapperApplicationFactory.GetBAFactoryTypeFromAssembly(section.AssemblyName); + var baFactory = (IBootstrapperApplicationFactory)Activator.CreateInstance(baFactoryType); + if (null == baFactory) + { + throw new InvalidBootstrapperApplicationFactoryException(); + } + + baFactory.Create(pArgs, pResults); + } + + /// + /// Locates the and returns the specified type. + /// + /// The assembly that defines the IBootstrapperApplicationFactory implementation. + /// The bootstrapper application factory . + private static Type GetBAFactoryTypeFromAssembly(string assemblyName) + { + Type baFactoryType = null; + + // Load the requested assembly. + Assembly asm = AppDomain.CurrentDomain.Load(assemblyName); + + // If an assembly was loaded and is not the current assembly, check for the required attribute. + // This is done to avoid using the BootstrapperApplicationFactoryAttribute which we use at build time + // to specify the BootstrapperApplicationFactory assembly in the manifest. + if (!Assembly.GetExecutingAssembly().Equals(asm)) + { + // There must be one and only one BootstrapperApplicationFactoryAttribute. + // The attribute prevents multiple declarations already. + var attrs = (BootstrapperApplicationFactoryAttribute[])asm.GetCustomAttributes(typeof(BootstrapperApplicationFactoryAttribute), false); + if (null != attrs) + { + baFactoryType = attrs[0].BootstrapperApplicationFactoryType; + } + } + + if (null == baFactoryType) + { + throw new MissingAttributeException(); + } + + return baFactoryType; + } + } +} diff --git a/src/WixToolset.Mba.Host/BootstrapperSectionGroup.cs b/src/WixToolset.Mba.Host/BootstrapperSectionGroup.cs new file mode 100644 index 00000000..5cf1bc9c --- /dev/null +++ b/src/WixToolset.Mba.Host/BootstrapperSectionGroup.cs @@ -0,0 +1,29 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + + /// + /// Handler for the wix.bootstrapper configuration section group. + /// + public class BootstrapperSectionGroup : ConfigurationSectionGroup + { + /// + /// Creates a new instance of the class. + /// + public BootstrapperSectionGroup() + { + } + + /// + /// Gets the handler for the mba configuration section. + /// + [ConfigurationProperty("host")] + public HostSection Host + { + get { return (HostSection)base.Sections["host"]; } + } + } +} diff --git a/src/WixToolset.Mba.Host/Exceptions.cs b/src/WixToolset.Mba.Host/Exceptions.cs new file mode 100644 index 00000000..c68951f0 --- /dev/null +++ b/src/WixToolset.Mba.Host/Exceptions.cs @@ -0,0 +1,145 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Runtime.Serialization; + + /// + /// Base class for exception returned to the bootstrapper application host. + /// + [Serializable] + public abstract class BootstrapperException : Exception + { + /// + /// Creates an instance of the base class with the given HRESULT. + /// + /// The HRESULT for the exception that is used by the bootstrapper application host. + public BootstrapperException(int hr) + { + this.HResult = hr; + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public BootstrapperException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public BootstrapperException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected BootstrapperException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } + + /// + /// The bootstrapper application assembly loaded by the host does not contain exactly one instance of the + /// class. + /// + /// + [Serializable] + public class MissingAttributeException : BootstrapperException + { + /// + /// Creates a new instance of the class. + /// + public MissingAttributeException() + : base(NativeMethods.E_NOTFOUND) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public MissingAttributeException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public MissingAttributeException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected MissingAttributeException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } + + /// + /// The bootstrapper application factory specified by the + /// does not extend the base class. + /// + /// + /// + [Serializable] + public class InvalidBootstrapperApplicationFactoryException : BootstrapperException + { + /// + /// Creates a new instance of the class. + /// + public InvalidBootstrapperApplicationFactoryException() + : base(NativeMethods.E_UNEXPECTED) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public InvalidBootstrapperApplicationFactoryException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public InvalidBootstrapperApplicationFactoryException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected InvalidBootstrapperApplicationFactoryException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } +} diff --git a/src/WixToolset.Mba.Host/HostSection.cs b/src/WixToolset.Mba.Host/HostSection.cs new file mode 100644 index 00000000..632025c7 --- /dev/null +++ b/src/WixToolset.Mba.Host/HostSection.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + + /// + /// Handler for the Host configuration section. + /// + public sealed class HostSection : ConfigurationSection + { + private static readonly ConfigurationProperty assemblyNameProperty = new ConfigurationProperty("assemblyName", typeof(string), null, ConfigurationPropertyOptions.IsRequired); + private static readonly ConfigurationProperty supportedFrameworksProperty = new ConfigurationProperty("", typeof(SupportedFrameworkElementCollection), null, ConfigurationPropertyOptions.IsDefaultCollection); + + /// + /// Creates a new instance of the class. + /// + public HostSection() + { + } + + /// + /// Gets the name of the assembly that contians the child class. + /// + /// + /// The assembly specified by this name must contain the to identify + /// the type of the child class. + /// + [ConfigurationProperty("assemblyName", IsRequired = true)] + public string AssemblyName + { + get { return (string)base[assemblyNameProperty]; } + set { base[assemblyNameProperty] = value; } + } + + /// + /// Gets the of supported frameworks for the host configuration. + /// + [ConfigurationProperty("", IsDefaultCollection = true)] + [ConfigurationCollection(typeof(SupportedFrameworkElement))] + public SupportedFrameworkElementCollection SupportedFrameworks + { + get { return (SupportedFrameworkElementCollection)base[supportedFrameworksProperty]; } + } + } +} diff --git a/src/WixToolset.Mba.Host/NativeMethods.cs b/src/WixToolset.Mba.Host/NativeMethods.cs new file mode 100644 index 00000000..b9fc85a0 --- /dev/null +++ b/src/WixToolset.Mba.Host/NativeMethods.cs @@ -0,0 +1,18 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Runtime.InteropServices; + + /// + /// Contains native constants, functions, and structures for this assembly. + /// + internal static class NativeMethods + { + #region Error Constants + internal const int E_NOTFOUND = unchecked((int)0x80070490); + internal const int E_UNEXPECTED = unchecked((int)0x8000ffff); + #endregion + } +} diff --git a/src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs b/src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..8cee0ae9 --- /dev/null +++ b/src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs @@ -0,0 +1,17 @@ +// 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. + +using System; +using System.Reflection; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("Managed Bootstrapper Application Host (WiX)")] +[assembly: AssemblyDescription("Managed Bootstrapper Application Host")] +[assembly: AssemblyProduct("WiX Toolset")] +[assembly: AssemblyCompany("WiX Toolset Team")] +[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")] + +// Types should not be visible to COM by default. +[assembly: ComVisible(false)] +[assembly: Guid("6f4e0cc9-8ad4-4b5a-a669-3aafff67a76f")] + +[assembly: CLSCompliantAttribute(true)] diff --git a/src/WixToolset.Mba.Host/SupportedFrameworkElement.cs b/src/WixToolset.Mba.Host/SupportedFrameworkElement.cs new file mode 100644 index 00000000..fe7fd2eb --- /dev/null +++ b/src/WixToolset.Mba.Host/SupportedFrameworkElement.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + + /// + /// Handler for the supportedFramework configuration section. + /// + public sealed class SupportedFrameworkElement : ConfigurationElement + { + private static readonly ConfigurationProperty versionProperty = new ConfigurationProperty("version", typeof(string), null, ConfigurationPropertyOptions.IsRequired); + private static readonly ConfigurationProperty runtimeVersionProperty = new ConfigurationProperty("runtimeVersion", typeof(string)); + + /// + /// Creates a new instance of the class. + /// + public SupportedFrameworkElement() + { + } + + /// + /// Gets the version of the supported framework. + /// + /// + /// The assembly specified by this name must contain a value matching the NETFX version registry key under + /// "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP". + /// + [ConfigurationProperty("version", IsRequired = true)] + public string Version + { + get { return (string)base[versionProperty]; } + set { base[versionProperty] = value; } + } + + /// + /// Gets the runtime version required by this supported framework. + /// + [ConfigurationProperty("runtimeVersion", IsRequired = false)] + public string RuntimeVersion + { + get { return (string)base[runtimeVersionProperty]; } + set { base[runtimeVersionProperty] = value; } + } + } +} diff --git a/src/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs b/src/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs new file mode 100644 index 00000000..12c7cf3e --- /dev/null +++ b/src/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs @@ -0,0 +1,36 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + using System.Diagnostics.CodeAnalysis; + + /// + /// Handler for the supportedFramework collection. + /// + [SuppressMessage("Microsoft.Design", "CA1010:CollectionsShouldImplementGenericInterface")] + [ConfigurationCollection(typeof(SupportedFrameworkElement), AddItemName = "supportedFramework", CollectionType = ConfigurationElementCollectionType.BasicMap)] + public sealed class SupportedFrameworkElementCollection : ConfigurationElementCollection + { + public override ConfigurationElementCollectionType CollectionType + { + get { return ConfigurationElementCollectionType.BasicMap; } + } + + protected override string ElementName + { + get { return "supportedFramework"; } + } + + protected override ConfigurationElement CreateNewElement() + { + return new SupportedFrameworkElement(); + } + + protected override object GetElementKey(ConfigurationElement element) + { + return (element as SupportedFrameworkElement).Version; + } + } +} diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.config b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.config new file mode 100644 index 00000000..a19b66f1 --- /dev/null +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.config @@ -0,0 +1,26 @@ + + + + + + + +
+ + + + + + + + + + + + + + diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj new file mode 100644 index 00000000..ccdd67cf --- /dev/null +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -0,0 +1,89 @@ + + + + + + + {F2BA1935-70FA-4156-B161-FD03850B4FAA} + WixToolset.Mba.Host + Library + WixToolset.Mba.Host + 0693;1591 + v2.0 + Managed Bootstrapper Application entry point + + + true + false + $(DefineConstants);DEBUG;TRACE + + + true + true + $(DefineConstants);TRACE + + + + + + + + + + + + + + + + + + + + + + + + ..\..\packages\WixToolset.Mba.Core.4.0.12\lib\net20\WixToolset.Mba.Core.dll + + + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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}. + + + + + + $(OutputPath)\$(AssemblyName).xml + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec new file mode 100644 index 00000000..101a6671 --- /dev/null +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec @@ -0,0 +1,20 @@ + + + + $id$ + $version$ + WiX Toolset Team + WiX Toolset Team + + https://licenses.nuget.org/MS-RL + https://github.com/wixtoolset/Bal.wixext + false + $description$ + $copyright$ + + + + + + + diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config new file mode 100644 index 00000000..eee20511 --- /dev/null +++ b/src/WixToolset.Mba.Host/packages.config @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.cpp b/src/mbahost/mbahost.cpp index 444a95a8..7916ec9a 100644 --- a/src/mbahost/mbahost.cpp +++ b/src/mbahost/mbahost.cpp @@ -1,8 +1,7 @@ // 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. #include "precomp.h" -#include // includes the generated assembly name macros. -#include "BalBaseBootstrapperApplicationProc.h" +#include // includes the generated assembly name macros. static const DWORD NET452_RELEASE = 379893; @@ -50,7 +49,6 @@ static HRESULT GetCLRHost( ); static HRESULT CreateManagedBootstrapperApplication( __in _AppDomain* pAppDomain, - __in IBootstrapperEngine* pEngine, __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, __inout BOOTSTRAPPER_CREATE_RESULTS* pResults ); @@ -109,7 +107,7 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate( { BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading managed bootstrapper application."); - hr = CreateManagedBootstrapperApplication(vpAppDomain, pEngine, pArgs, pResults); + hr = CreateManagedBootstrapperApplication(vpAppDomain, pArgs, pResults); BalExitOnFailure(hr, "Failed to create the managed bootstrapper application."); } else // fallback to the prerequisite BA. @@ -185,7 +183,7 @@ static HRESULT GetAppDomain( hr = GetAppBase(&sczAppBase); ExitOnFailure(hr, "Failed to get the host base path."); - hr = PathConcat(sczAppBase, L"WixToolset.Mba.Core.config", &sczConfigPath); + hr = PathConcat(sczAppBase, MBA_CONFIG_FILE_NAME, &sczConfigPath); ExitOnFailure(hr, "Failed to get the full path to the application configuration file."); // Check that the supported framework is installed. @@ -514,27 +512,20 @@ LExit: // Creates the bootstrapper app and returns it for the engine. static HRESULT CreateManagedBootstrapperApplication( __in _AppDomain* pAppDomain, - __in IBootstrapperEngine* pEngine, __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, __inout BOOTSTRAPPER_CREATE_RESULTS* pResults ) { HRESULT hr = S_OK; IBootstrapperApplicationFactory* pAppFactory = NULL; - IBootstrapperApplication* pApp = NULL; hr = CreateManagedBootstrapperApplicationFactory(pAppDomain, &pAppFactory); ExitOnFailure(hr, "Failed to create the factory to create the bootstrapper application."); - hr = pAppFactory->Create(pEngine, pArgs->pCommand, &pApp); + hr = pAppFactory->Create(pArgs, pResults); ExitOnFailure(hr, "Failed to create the bootstrapper application."); - pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; - pResults->pvBootstrapperApplicationProcContext = pApp; - pApp = NULL; - LExit: - ReleaseNullObject(pApp); ReleaseNullObject(pAppFactory); return hr; @@ -557,7 +548,7 @@ static HRESULT CreateManagedBootstrapperApplicationFactory( bstrAssemblyName = ::SysAllocString(MBA_ASSEMBLY_FULL_NAME); ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory."); - bstrTypeName = ::SysAllocString(L"WixToolset.Mba.Core.BootstrapperApplicationFactory"); + bstrTypeName = ::SysAllocString(MBA_ENTRY_TYPE); ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory."); hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj); diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index c7a0b69f..30bffb54 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -52,13 +52,14 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.9\build\native\include\;%(AdditionalIncludeDirectories) + $(BaseOutputPath)obj;%(AdditionalIncludeDirectories) - - + + {f2ba1935-70fa-4156-b161-fd03850b4faa} + @@ -67,13 +68,9 @@ 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/mbahost/packages.config b/src/mbahost/packages.config index c616685e..f209d5fb 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,9 +1,7 @@  - - - + + - \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h index 8142b26c..d2b53718 100644 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h +++ b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h @@ -8,7 +8,6 @@ namespace MbaHost namespace Native { using namespace System; - using namespace WixToolset::BootstrapperCore; using namespace WixToolset::Mba::Core; public ref class TestManagedBootstrapperApplication : BootstrapperApplication diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config b/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config deleted file mode 100644 index 18bfbfc2..00000000 --- a/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Core.config +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config b/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config new file mode 100644 index 00000000..53a3d29e --- /dev/null +++ b/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config @@ -0,0 +1,26 @@ + + + + + + + +
+ + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj index b82f9194..d8143880 100644 --- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj +++ b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -48,7 +48,10 @@ - + + + False + @@ -65,11 +68,8 @@ ..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll - - ..\..\..\packages\WixToolset.BootstrapperCore.4.0.8\lib\net20\WixToolset.BootstrapperCore.dll - - ..\..\..\packages\WixToolset.Mba.Core.4.0.9\lib\net20\WixToolset.Mba.Core.dll + ..\..\..\packages\WixToolset.Mba.Core.4.0.12\lib\net20\WixToolset.Mba.Core.dll @@ -85,8 +85,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}. - - + + diff --git a/src/test/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config index c0615f19..4e9838f6 100644 --- a/src/test/WixToolsetTest.MbaHost/packages.config +++ b/src/test/WixToolsetTest.MbaHost/packages.config @@ -8,9 +8,8 @@ - - - + + - + \ No newline at end of file diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs index 05b57100..a99b41d8 100644 --- a/src/wixlib/Mba.wxs +++ b/src/wixlib/Mba.wxs @@ -40,8 +40,7 @@ - - + diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 7c46d4c5..f209d5fb 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index c3d3ede7..b0f767fb 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -107,8 +107,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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}. - - + + -- cgit v1.2.3-55-g6feb From 4a176b759c47fa1970fcfd0d9e25c294bda82ef4 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 22 Dec 2019 13:51:35 +1100 Subject: Update the MbaHost test project to use an external exe to load the BA, which allows loading a different .NET than the one running the tests. This also allows writing the tests in C# instead of C++/CLI. --- Bal.wixext.sln | 91 ++++++++++++++-- src/Custom.Build.props | 9 ++ .../WixToolsetTest.ManagedHost/MbaHostFixture.cs | 40 +++++++ src/test/WixToolsetTest.ManagedHost/TestEngine.cs | 53 ++++++++++ .../WixToolsetTest.ManagedHost/TestEngineResult.cs | 12 +++ .../WixToolsetTest.ManagedHost.csproj | 31 ++++++ .../BootstrapperApplicationData.xml | Bin 20128 -> 0 bytes src/test/WixToolsetTest.MbaHost/EngineForTest.cpp | 45 -------- src/test/WixToolsetTest.MbaHost/EngineForTest.h | 63 ----------- src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp | 70 ------------ .../TestManagedBootstrapperApplication.h | 34 ------ .../TestManagedBootstrapperApplicationFactory.h | 25 ----- .../WixToolset.Mba.Host.config | 26 ----- .../WixToolsetTest.MbaHost.vcxproj | 95 ----------------- src/test/WixToolsetTest.MbaHost/packages.config | 15 --- src/test/WixToolsetTest.MbaHost/precomp.cpp | 3 - src/test/WixToolsetTest.MbaHost/precomp.h | 16 --- .../BootstrapperApplicationData.xml | Bin 0 -> 20128 bytes .../Example.FullFramework2MBA.csproj | 77 ++++++++++++++ .../examples/FullFramework2MBA/FullFramework2BA.cs | 27 +++++ .../FullFramework2MBA/FullFramework2BAFactory.cs | 14 +++ .../FullFramework2MBA/Properties/AssemblyInfo.cs | 18 ++++ .../FullFramework2MBA/WixToolset.Mba.Host.config | 20 ++++ .../examples/FullFramework2MBA/packages.config | 4 + .../BootstrapperApplicationData.xml | Bin 0 -> 20128 bytes .../Example.FullFramework4MBA.csproj | 38 +++++++ .../examples/FullFramework4MBA/FullFramework4BA.cs | 27 +++++ .../FullFramework4MBA/FullFramework4BAFactory.cs | 15 +++ .../FullFramework4MBA/WixToolset.Mba.Host.config | 17 +++ .../examples/TestEngine/Example.TestEngine.vcxproj | 70 ++++++++++++ src/test/examples/TestEngine/ExampleTestEngine.cpp | 22 ++++ src/test/examples/TestEngine/ShutdownEngine.cpp | 23 ++++ src/test/examples/TestEngine/TestEngine.cpp | 117 +++++++++++++++++++++ src/test/examples/TestEngine/TestEngine.h | 42 ++++++++ src/test/examples/TestEngine/packages.config | 7 ++ src/test/examples/TestEngine/precomp.cpp | 3 + src/test/examples/TestEngine/precomp.h | 19 ++++ 37 files changed, 786 insertions(+), 402 deletions(-) create mode 100644 src/Custom.Build.props create mode 100644 src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestEngine.cs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs create mode 100644 src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj delete mode 100644 src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml delete mode 100644 src/test/WixToolsetTest.MbaHost/EngineForTest.cpp delete mode 100644 src/test/WixToolsetTest.MbaHost/EngineForTest.h delete mode 100644 src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp delete mode 100644 src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h delete mode 100644 src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h delete mode 100644 src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config delete mode 100644 src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj delete mode 100644 src/test/WixToolsetTest.MbaHost/packages.config delete mode 100644 src/test/WixToolsetTest.MbaHost/precomp.cpp delete mode 100644 src/test/WixToolsetTest.MbaHost/precomp.h create mode 100644 src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml create mode 100644 src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj create mode 100644 src/test/examples/FullFramework2MBA/FullFramework2BA.cs create mode 100644 src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs create mode 100644 src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs create mode 100644 src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config create mode 100644 src/test/examples/FullFramework2MBA/packages.config create mode 100644 src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml create mode 100644 src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj create mode 100644 src/test/examples/FullFramework4MBA/FullFramework4BA.cs create mode 100644 src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs create mode 100644 src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config create mode 100644 src/test/examples/TestEngine/Example.TestEngine.vcxproj create mode 100644 src/test/examples/TestEngine/ExampleTestEngine.cpp create mode 100644 src/test/examples/TestEngine/ShutdownEngine.cpp create mode 100644 src/test/examples/TestEngine/TestEngine.cpp create mode 100644 src/test/examples/TestEngine/TestEngine.h create mode 100644 src/test/examples/TestEngine/packages.config create mode 100644 src/test/examples/TestEngine/precomp.cpp create mode 100644 src/test/examples/TestEngine/precomp.h (limited to 'src') diff --git a/Bal.wixext.sln b/Bal.wixext.sln index 867beef5..e74e99c3 100644 --- a/Bal.wixext.sln +++ b/Bal.wixext.sln @@ -13,78 +13,149 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixpr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WixToolsetTest.MbaHost", "src\test\WixToolsetTest.MbaHost\WixToolsetTest.MbaHost.vcxproj", "{8C131CB9-7B1C-4B06-A328-E69CE9EDC763}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "src\test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost", "src\test\WixToolsetTest.ManagedHost\WixToolsetTest.ManagedHost.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "src\test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.ActiveCfg = Debug|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.Build.0 = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x64.ActiveCfg = Debug|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.ActiveCfg = Debug|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.Build.0 = Debug|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.ActiveCfg = Release|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.Build.0 = Release|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.ActiveCfg = Release|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.ActiveCfg = Release|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.Build.0 = Release|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.ActiveCfg = Debug|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.Build.0 = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.ActiveCfg = Debug|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.ActiveCfg = Debug|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.Build.0 = Debug|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.ActiveCfg = Release|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.Build.0 = Release|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.ActiveCfg = Release|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.ActiveCfg = Release|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.Build.0 = Release|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.ActiveCfg = Debug|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.Build.0 = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x64.ActiveCfg = Debug|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.ActiveCfg = Debug|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.Build.0 = Debug|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.ActiveCfg = Release|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.Build.0 = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x64.ActiveCfg = Release|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.ActiveCfg = Release|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.Build.0 = Release|Win32 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.ActiveCfg = Debug|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.Build.0 = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x64.ActiveCfg = Debug|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.ActiveCfg = Debug|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.Build.0 = Debug|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.ActiveCfg = Release|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.Build.0 = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x64.ActiveCfg = Release|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.ActiveCfg = Release|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.Build.0 = Release|x86 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.ActiveCfg = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.Build.0 = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.ActiveCfg = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.Build.0 = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.Build.0 = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.ActiveCfg = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.Build.0 = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.ActiveCfg = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.Build.0 = Release|Any CPU - {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|Any CPU.Build.0 = Debug|Win32 - {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|x86.ActiveCfg = Debug|Win32 - {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Debug|x86.Build.0 = Debug|Win32 - {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|Any CPU.ActiveCfg = Release|Win32 - {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|Any CPU.Build.0 = Release|Win32 - {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|x86.ActiveCfg = Release|Win32 - {8C131CB9-7B1C-4B06-A328-E69CE9EDC763}.Release|x86.Build.0 = Release|Win32 {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.ActiveCfg = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.Build.0 = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.ActiveCfg = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.Build.0 = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.Build.0 = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.ActiveCfg = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.Build.0 = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.ActiveCfg = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.Build.0 = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.ActiveCfg = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.Build.0 = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.ActiveCfg = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.Build.0 = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.Build.0 = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.ActiveCfg = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.Build.0 = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.ActiveCfg = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.Build.0 = Release|Any CPU + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.Build.0 = Debug|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.ActiveCfg = Debug|x64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.Build.0 = Debug|x64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.ActiveCfg = Debug|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.Build.0 = Debug|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.ActiveCfg = Release|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.Build.0 = Release|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.ActiveCfg = Release|x64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.Build.0 = Release|x64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.ActiveCfg = Release|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.Build.0 = Release|Win32 + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.ActiveCfg = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.Build.0 = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.ActiveCfg = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.Build.0 = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.Build.0 = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.ActiveCfg = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.Build.0 = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.ActiveCfg = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.Build.0 = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.ActiveCfg = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.Build.0 = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.ActiveCfg = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.Build.0 = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.Build.0 = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.ActiveCfg = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.Build.0 = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.ActiveCfg = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {CC4236FC-226E-4232-AB50-24CBEC4D314D} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {3D44B67D-A475-49BA-8310-E39F6C117CC9} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {44297646-706D-4508-8E96-1B35B109694C} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {74046961-48BF-467A-A6C2-F886C75CE0BE} EndGlobalSection diff --git a/src/Custom.Build.props b/src/Custom.Build.props new file mode 100644 index 00000000..f4352014 --- /dev/null +++ b/src/Custom.Build.props @@ -0,0 +1,9 @@ + + + + + + $(OutputPath)examples\$(ProjectName)\ + $(OutDir)examples\$(ProjectName)\ + + diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs new file mode 100644 index 00000000..8da42e77 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs @@ -0,0 +1,40 @@ +// 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. + +namespace WixToolsetTest.ManagedHost +{ + using WixBuildTools.TestSupport; + using Xunit; + + public class MbaHostFixture + { + [Fact] + public void CanLoadFullFramework2MBA() + { + var testEngine = new TestEngine(); + var baFile = TestData.Get(@"..\examples\Example.FullFramework2MBA\mbahost.dll"); + + var result = testEngine.RunShutdownEngine(baFile); + Assert.Equal(0, result.ExitCode); + + var logMessages = result.Output; + Assert.Equal(2, logMessages.Count); + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]); + } + + [Fact] + public void CanLoadFullFramework4MBA() + { + var testEngine = new TestEngine(); + var baFile = TestData.Get(@"..\examples\Example.FullFramework4MBA\net48\mbahost.dll"); + + var result = testEngine.RunShutdownEngine(baFile); + Assert.Equal(0, result.ExitCode); + + var logMessages = result.Output; + Assert.Equal(2, logMessages.Count); + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]); + } + } +} diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs new file mode 100644 index 00000000..4dd531ad --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs @@ -0,0 +1,53 @@ +// 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. + +namespace WixToolsetTest.ManagedHost +{ + using System.Collections.Generic; + using System.Diagnostics; + using WixBuildTools.TestSupport; + + public class TestEngine + { + private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); + + public TestEngineResult RunShutdownEngine(string baFile) + { + var args = new string[] { '"' + baFile + '"' }; + return RunProcessCaptureOutput(TestEngineFile, args); + } + + private static TestEngineResult RunProcessCaptureOutput(string executablePath, string[] arguments = null, string workingFolder = null) + { + var startInfo = new ProcessStartInfo(executablePath) + { + Arguments = string.Join(' ', arguments), + CreateNoWindow = true, + RedirectStandardError = true, + RedirectStandardOutput = true, + UseShellExecute = false, + WorkingDirectory = workingFolder, + }; + + var exitCode = 0; + var output = new List(); + + using (var process = Process.Start(startInfo)) + { + process.OutputDataReceived += (s, e) => { if (e.Data != null) { output.Add(e.Data); } }; + process.ErrorDataReceived += (s, e) => { if (e.Data != null) { output.Add(e.Data); } }; + + process.BeginErrorReadLine(); + process.BeginOutputReadLine(); + + process.WaitForExit(); + exitCode = process.ExitCode; + } + + return new TestEngineResult + { + ExitCode = exitCode, + Output = output, + }; + } + } +} diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs b/src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs new file mode 100644 index 00000000..63f6f7f5 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs @@ -0,0 +1,12 @@ +// 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. + +namespace WixToolsetTest.ManagedHost +{ + using System.Collections.Generic; + + public class TestEngineResult + { + public int ExitCode { get; set; } + public List Output { get; set; } + } +} diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj new file mode 100644 index 00000000..cb1d1c78 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -0,0 +1,31 @@ + + + + + + netcoreapp2.1 + false + + + + NU1701 + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml b/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml deleted file mode 100644 index 7c4169b1..00000000 Binary files a/src/test/WixToolsetTest.MbaHost/BootstrapperApplicationData.xml and /dev/null differ diff --git a/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp b/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp deleted file mode 100644 index b2567a7b..00000000 --- a/src/test/WixToolsetTest.MbaHost/EngineForTest.cpp +++ /dev/null @@ -1,45 +0,0 @@ -// 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. - -#include "precomp.h" - -static HRESULT BAEngineLog( - __in BOOTSTRAPPER_ENGINE_CONTEXT* pContext, - __in BAENGINE_LOG_ARGS* pArgs, - __in BAENGINE_LOG_RESULTS* /*pResults*/ -) -{ - HRESULT hr = S_OK; - - pContext->pfnLog(pArgs->wzMessage); - - return hr; -} - -HRESULT WINAPI EngineForTestProc( - __in BOOTSTRAPPER_ENGINE_MESSAGE message, - __in const LPVOID pvArgs, - __inout LPVOID pvResults, - __in_opt LPVOID pvContext -) -{ - HRESULT hr = S_OK; - BOOTSTRAPPER_ENGINE_CONTEXT* pContext = reinterpret_cast(pvContext); - - if (!pContext || !pvArgs || !pvResults) - { - ExitFunction1(hr = E_INVALIDARG); - } - - switch (message) - { - case BOOTSTRAPPER_ENGINE_MESSAGE_LOG: - hr = BAEngineLog(pContext, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - default: - hr = E_NOTIMPL; - break; - } - -LExit: - return hr; -} \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/EngineForTest.h b/src/test/WixToolsetTest.MbaHost/EngineForTest.h deleted file mode 100644 index 6058e67c..00000000 --- a/src/test/WixToolsetTest.MbaHost/EngineForTest.h +++ /dev/null @@ -1,63 +0,0 @@ -#pragma once -// 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. - -HRESULT WINAPI EngineForTestProc( - __in BOOTSTRAPPER_ENGINE_MESSAGE message, - __in const LPVOID pvArgs, - __inout LPVOID pvResults, - __in_opt LPVOID pvContext -); - -typedef void(WINAPI *PFN_TEST_LOG_PROC)( - __in LPCWSTR sczMessage - ); - -struct BOOTSTRAPPER_ENGINE_CONTEXT -{ - PFN_TEST_LOG_PROC pfnLog; -}; - -namespace WixToolsetTest -{ -namespace MbaHost -{ -namespace Native -{ - using namespace System; - using namespace System::Collections::Generic; - using namespace System::Runtime::InteropServices; - - public ref class EngineForTest - { - private: - delegate void LogDelegate(LPCWSTR); - LogDelegate^ _logDelegate; - List^ _messages; - - void Log(LPCWSTR sczMessage) - { - String^ message = gcnew String(sczMessage); - System::Diagnostics::Debug::WriteLine(message); - _messages->Add(message); - } - public: - EngineForTest() - { - _logDelegate = gcnew LogDelegate(this, &EngineForTest::Log); - _messages = gcnew List(); - } - - List^ GetLogMessages() - { - return _messages; - } - - PFN_TEST_LOG_PROC GetTestLogProc() - { - IntPtr functionPointer = Marshal::GetFunctionPointerForDelegate(_logDelegate); - return static_cast(functionPointer.ToPointer()); - } - }; -} -} -} \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp b/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp deleted file mode 100644 index 9328aacf..00000000 --- a/src/test/WixToolsetTest.MbaHost/MbaHostFixture.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// 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. - -#include "precomp.h" - -namespace WixToolsetTest -{ -namespace MbaHost -{ -namespace Native -{ - using namespace System; - using namespace Xunit; - - public ref class MbaHostFixture - { - public: - [Fact] - void CanLoadManagedBootstrapperApplication() - { - HMODULE hBAModule = NULL; - PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL; - HRESULT hr = S_OK; - - EngineForTest^ engine = gcnew EngineForTest(); - BOOTSTRAPPER_ENGINE_CONTEXT engineContext = { }; - engineContext.pfnLog = engine->GetTestLogProc(); - - LogInitialize(::GetModuleHandleW(NULL)); - - hr = LogOpen(NULL, L"MbaHostUnitTest", NULL, L"txt", FALSE, FALSE, NULL); - Assert::Equal(S_OK, hr); - - BOOTSTRAPPER_COMMAND command = { }; - BOOTSTRAPPER_CREATE_ARGS args = { }; - BOOTSTRAPPER_CREATE_RESULTS results = { }; - - args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS); - args.pCommand = &command; - args.pfnBootstrapperEngineProc = EngineForTestProc; - args.pvBootstrapperEngineProcContext = &engineContext; - args.qwEngineAPIVersion = MAKEQWORDVERSION(0, 0, 0, 1); - - results.cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); - - hBAModule = ::LoadLibraryExW(L"mbahost.dll", NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - Assert::NotEqual(NULL, (int)hBAModule); - - pfnCreate = (PFN_BOOTSTRAPPER_APPLICATION_CREATE)::GetProcAddress(hBAModule, "BootstrapperApplicationCreate"); - Assert::NotEqual(NULL, (int)pfnCreate); - - hr = pfnCreate(&args, &results); - Assert::Equal(S_OK, hr); - - BA_ONSHUTDOWN_ARGS shutdownArgs = { }; - BA_ONSHUTDOWN_RESULTS shutdownResults = { }; - shutdownArgs.cbSize = sizeof(BA_ONSHUTDOWN_ARGS); - shutdownResults.action = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER; - shutdownResults.cbSize = sizeof(BA_ONSHUTDOWN_RESULTS); - hr = results.pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN, &shutdownArgs, &shutdownResults, results.pvBootstrapperApplicationProcContext); - Assert::Equal(S_OK, hr); - - List^ logMessages = engine->GetLogMessages(); - Assert::Equal(2, logMessages->Count); - Assert::Equal("Loading managed bootstrapper application.", logMessages[0]); - Assert::Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]); - } - }; -} -} -} diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h deleted file mode 100644 index d2b53718..00000000 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplication.h +++ /dev/null @@ -1,34 +0,0 @@ -#pragma once -// 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. - -namespace WixToolsetTest -{ -namespace MbaHost -{ -namespace Native -{ - using namespace System; - using namespace WixToolset::Mba::Core; - - public ref class TestManagedBootstrapperApplication : BootstrapperApplication - { - public: - TestManagedBootstrapperApplication(WixToolset::Mba::Core::IEngine^ engine) - : BootstrapperApplication(engine) - { - - } - - virtual void Run() override - { - } - - virtual void OnShutdown(ShutdownEventArgs^ e) override - { - String^ message = "Shutdown," + e->Action.ToString() + "," + e->HResult.ToString(); - this->engine->Log(LogLevel::Standard, message); - } - }; -} -} -} \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h b/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h deleted file mode 100644 index 86f6e3cb..00000000 --- a/src/test/WixToolsetTest.MbaHost/TestManagedBootstrapperApplicationFactory.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once -// 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. - -namespace WixToolsetTest -{ -namespace MbaHost -{ -namespace Native -{ - using namespace System; - using namespace WixToolset::Mba::Core; - - public ref class TestManagedBootstrapperApplicationFactory : public BaseBootstrapperApplicationFactory - { - protected: - virtual IBootstrapperApplication^ Create(IEngine^ engine, IBootstrapperCommand^ /*command*/) override - { - return gcnew TestManagedBootstrapperApplication(engine); - } - }; - - [assembly:BootstrapperApplicationFactory(TestManagedBootstrapperApplicationFactory::typeid)]; -} -} -} \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config b/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config deleted file mode 100644 index 53a3d29e..00000000 --- a/src/test/WixToolsetTest.MbaHost/WixToolset.Mba.Host.config +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj b/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj deleted file mode 100644 index d8143880..00000000 --- a/src/test/WixToolsetTest.MbaHost/WixToolsetTest.MbaHost.vcxproj +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - Debug - Win32 - - - Release - Win32 - - - - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942} - {8C131CB9-7B1C-4B06-A328-E69CE9EDC763} - WixToolsetTest.MbaHost - ManagedCProj - DynamicLibrary - v141 - Unicode - true - v4.6.1 - - - - - - - - - - - Create - - - - - - - - - - - - - - - False - - - - - - - ..\..\..\packages\xunit.abstractions.2.0.2\lib\net35\xunit.abstractions.dll - - - ..\..\..\packages\xunit.assert.2.4.0\lib\netstandard2.0\xunit.assert.dll - - - ..\..\..\packages\xunit.extensibility.core.2.4.0\lib\net452\xunit.core.dll - - - ..\..\..\packages\xunit.extensibility.execution.2.4.0\lib\net452\xunit.execution.desktop.dll - - - ..\..\..\packages\WixToolset.Mba.Core.4.0.12\lib\net20\WixToolset.Mba.Core.dll - - - - - {12c87c77-3547-44f8-8134-29bc915cb19d} - - - - - - - - - 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/WixToolsetTest.MbaHost/packages.config b/src/test/WixToolsetTest.MbaHost/packages.config deleted file mode 100644 index 4e9838f6..00000000 --- a/src/test/WixToolsetTest.MbaHost/packages.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.MbaHost/precomp.cpp b/src/test/WixToolsetTest.MbaHost/precomp.cpp deleted file mode 100644 index 37664a1c..00000000 --- a/src/test/WixToolsetTest.MbaHost/precomp.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// 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. - -#include "precomp.h" diff --git a/src/test/WixToolsetTest.MbaHost/precomp.h b/src/test/WixToolsetTest.MbaHost/precomp.h deleted file mode 100644 index 7c451c03..00000000 --- a/src/test/WixToolsetTest.MbaHost/precomp.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once -// 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. - - -#include -#include - -#include "dutil.h" -#include "logutil.h" - -#include "BootstrapperEngine.h" -#include "BootstrapperApplication.h" - -#include "EngineForTest.h" -#include "TestManagedBootstrapperApplication.h" -#include "TestManagedBootstrapperApplicationFactory.h" diff --git a/src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml b/src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml new file mode 100644 index 00000000..7c4169b1 Binary files /dev/null and b/src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml differ diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj new file mode 100644 index 00000000..dec1ff1e --- /dev/null +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -0,0 +1,77 @@ + + + + + + + + {CC4236FC-226E-4232-AB50-24CBEC4D314D} + Example.FullFramework2MBA + Library + Example.FullFramework2MBA + v2.0 + false + + + true + false + $(DefineConstants);DEBUG;TRACE + + + true + true + $(DefineConstants);TRACE + + + + + + + + + + + + + + + + + + + + ..\..\..\..\packages\WixToolset.Mba.Core.4.0.12\lib\net20\WixToolset.Mba.Core.dll + + + + + {12c87c77-3547-44f8-8134-29bc915cb19d} + false + + + {F2BA1935-70FA-4156-B161-FD03850B4FAA} + false + Content + PreserveNewest + + + + + + + + + + + + + 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/FullFramework2BA.cs b/src/test/examples/FullFramework2MBA/FullFramework2BA.cs new file mode 100644 index 00000000..13d4673a --- /dev/null +++ b/src/test/examples/FullFramework2MBA/FullFramework2BA.cs @@ -0,0 +1,27 @@ +// 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. + +namespace Example.FullFramework2MBA +{ + using WixToolset.Mba.Core; + + public class FullFramework2BA : BootstrapperApplication + { + public FullFramework2BA(IEngine engine) + : base(engine) + { + + } + + protected override void Run() + { + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs new file mode 100644 index 00000000..d3cafc70 --- /dev/null +++ b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs @@ -0,0 +1,14 @@ +// 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. + +namespace Example.FullFramework2MBA +{ + using WixToolset.Mba.Core; + + public class FullFramework2BAFactory : BaseBootstrapperApplicationFactory + { + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + return new FullFramework2BA(engine); + } + } +} diff --git a/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs b/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..640c17ad --- /dev/null +++ b/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs @@ -0,0 +1,18 @@ +// 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. + +using System; +using System.Reflection; +using System.Runtime.InteropServices; +using WixToolset.Mba.Core; + +[assembly: AssemblyTitle("Example.FullFramework2MBA")] +[assembly: AssemblyDescription("Example.FullFramework2MBA")] +[assembly: AssemblyProduct("WiX Toolset")] +[assembly: AssemblyCompany("WiX Toolset Team")] +[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")] + +// Types should not be visible to COM by default. +[assembly: ComVisible(false)] +[assembly: Guid("7A671EAF-FAE5-41A2-83DD-C35AB3779651")] + +[assembly: BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))] diff --git a/src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config b/src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config new file mode 100644 index 00000000..be450a4f --- /dev/null +++ b/src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config @@ -0,0 +1,20 @@ + + + + + + + +
+ + + + + + + + + + + + diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config new file mode 100644 index 00000000..77b7e398 --- /dev/null +++ b/src/test/examples/FullFramework2MBA/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml b/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml new file mode 100644 index 00000000..7c4169b1 Binary files /dev/null and b/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml differ diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj new file mode 100644 index 00000000..e044c6b1 --- /dev/null +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -0,0 +1,38 @@ + + + + net48 + Full Framework v4 MBA + + + + + + + + + + + + + + + {12c87c77-3547-44f8-8134-29bc915cb19d} + false + + + {F2BA1935-70FA-4156-B161-FD03850B4FAA} + false + Content + PreserveNewest + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/examples/FullFramework4MBA/FullFramework4BA.cs b/src/test/examples/FullFramework4MBA/FullFramework4BA.cs new file mode 100644 index 00000000..556a61a7 --- /dev/null +++ b/src/test/examples/FullFramework4MBA/FullFramework4BA.cs @@ -0,0 +1,27 @@ +// 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. + +namespace Example.FullFramework4MBA +{ + using WixToolset.Mba.Core; + + public class FullFramework4BA : BootstrapperApplication + { + public FullFramework4BA(IEngine engine) + : base(engine) + { + + } + + protected override void Run() + { + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs b/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs new file mode 100644 index 00000000..b7c8750d --- /dev/null +++ b/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs @@ -0,0 +1,15 @@ +// 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. + +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework4MBA.FullFramework4BAFactory))] +namespace Example.FullFramework4MBA +{ + using WixToolset.Mba.Core; + + public class FullFramework4BAFactory : BaseBootstrapperApplicationFactory + { + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + return new FullFramework4BA(engine); + } + } +} diff --git a/src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config b/src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config new file mode 100644 index 00000000..96678cda --- /dev/null +++ b/src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config @@ -0,0 +1,17 @@ + + + + + + + +
+ + + + + + + + + diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj new file mode 100644 index 00000000..ab79dacc --- /dev/null +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -0,0 +1,70 @@ + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {3D44B67D-A475-49BA-8310-E39F6C117CC9} + Application + Console + Example.TestEngine + v141 + Unicode + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + 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/ExampleTestEngine.cpp b/src/test/examples/TestEngine/ExampleTestEngine.cpp new file mode 100644 index 00000000..9f051875 --- /dev/null +++ b/src/test/examples/TestEngine/ExampleTestEngine.cpp @@ -0,0 +1,22 @@ +// 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. + +#include "precomp.h" + +int __cdecl wmain(int argc, LPWSTR argv[]) +{ + HRESULT hr = E_INVALIDARG; + + ConsoleInitialize(); + + if (argc != 2) + { + ConsoleWriteError(hr, CONSOLE_COLOR_RED, "Usage: Example.TestEngine.exe BA.dll"); + } + else + { + hr = RunShutdownEngine(argv[1]); + } + + ConsoleUninitialize(); + return HRESULT_CODE(hr); +} diff --git a/src/test/examples/TestEngine/ShutdownEngine.cpp b/src/test/examples/TestEngine/ShutdownEngine.cpp new file mode 100644 index 00000000..69321d91 --- /dev/null +++ b/src/test/examples/TestEngine/ShutdownEngine.cpp @@ -0,0 +1,23 @@ +// 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. + +#include "precomp.h" + +HRESULT RunShutdownEngine( + __in LPCWSTR wzBAFilePath + ) +{ + HRESULT hr = S_OK; + TestEngine* pTestEngine = NULL; + + pTestEngine = new TestEngine(); + ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); + + hr = pTestEngine->LoadBA(wzBAFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); + + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); + +LExit: + return hr; +} diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp new file mode 100644 index 00000000..c0a62eda --- /dev/null +++ b/src/test/examples/TestEngine/TestEngine.cpp @@ -0,0 +1,117 @@ +// 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. + +#include "precomp.h" + +HRESULT TestEngine::LoadBA( + __in LPCWSTR wzBAFilePath + ) +{ + HRESULT hr = S_OK; + BOOTSTRAPPER_COMMAND command = { }; + BOOTSTRAPPER_CREATE_ARGS args = { }; + HMODULE hBAModule = NULL; + PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL; + + if (m_pCreateResults) + { + ExitFunction1(hr = E_INVALIDSTATE); + } + + LogInitialize(::GetModuleHandleW(NULL)); + + hr = LogOpen(NULL, L"ExampleTestEngine", NULL, L"txt", FALSE, FALSE, NULL); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to open log."); + + m_pCreateResults = static_cast(MemAlloc(sizeof(BOOTSTRAPPER_CREATE_RESULTS), TRUE)); + + command.cbSize = sizeof(BOOTSTRAPPER_COMMAND); + + args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS); + args.pCommand = &command; + args.pfnBootstrapperEngineProc = TestEngine::EngineProc; + args.pvBootstrapperEngineProcContext = this; + args.qwEngineAPIVersion = MAKEQWORDVERSION(0, 0, 0, 1); + + m_pCreateResults->cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); + + hBAModule = ::LoadLibraryExW(wzBAFilePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + ExitOnNullWithLastError(hBAModule, hr, "Failed to load BA dll."); + + pfnCreate = (PFN_BOOTSTRAPPER_APPLICATION_CREATE)::GetProcAddress(hBAModule, "BootstrapperApplicationCreate"); + ConsoleExitOnNull(pfnCreate, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to get address for BootstrapperApplicationCreate."); + + hr = pfnCreate(&args, m_pCreateResults); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure on BootstrapperApplicationCreate."); + +LExit: + return hr; +} + +HRESULT TestEngine::Log( + __in LPCWSTR wzMessage + ) +{ + return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage); +} + +HRESULT TestEngine::SendShutdownEvent( + __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction + ) +{ + HRESULT hr = S_OK; + BA_ONSHUTDOWN_ARGS shutdownArgs = { }; + BA_ONSHUTDOWN_RESULTS shutdownResults = { }; + shutdownArgs.cbSize = sizeof(BA_ONSHUTDOWN_ARGS); + shutdownResults.action = defaultAction; + shutdownResults.cbSize = sizeof(BA_ONSHUTDOWN_RESULTS); + hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN, &shutdownArgs, &shutdownResults, m_pCreateResults->pvBootstrapperApplicationProcContext); + return hr; +} + +HRESULT TestEngine::BAEngineLog( + __in TestEngine* pContext, + __in BAENGINE_LOG_ARGS* pArgs, + __in BAENGINE_LOG_RESULTS* /*pResults*/ + ) +{ + return pContext->Log(pArgs->wzMessage); +} + +HRESULT WINAPI TestEngine::EngineProc( + __in BOOTSTRAPPER_ENGINE_MESSAGE message, + __in const LPVOID pvArgs, + __inout LPVOID pvResults, + __in_opt LPVOID pvContext + ) +{ + HRESULT hr = S_OK; + TestEngine* pContext = (TestEngine*)pvContext; + + if (!pContext || !pvArgs || !pvResults) + { + ExitFunction1(hr = E_INVALIDARG); + } + + switch (message) + { + case BOOTSTRAPPER_ENGINE_MESSAGE_LOG: + hr = BAEngineLog(pContext, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + default: + hr = E_NOTIMPL; + break; + } + +LExit: + return hr; +} + +TestEngine::TestEngine() +{ + m_pCreateResults = NULL; +} + +TestEngine::~TestEngine() +{ + ReleaseMem(m_pCreateResults); +} \ No newline at end of file diff --git a/src/test/examples/TestEngine/TestEngine.h b/src/test/examples/TestEngine/TestEngine.h new file mode 100644 index 00000000..52872100 --- /dev/null +++ b/src/test/examples/TestEngine/TestEngine.h @@ -0,0 +1,42 @@ +#pragma once +// 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. + +#include "precomp.h" + +class TestEngine +{ +public: + HRESULT LoadBA( + __in LPCWSTR wzBAFilePath + ); + + HRESULT Log( + __in LPCWSTR wzMessage + ); + + HRESULT SendShutdownEvent( + __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction + ); + +private: + static HRESULT BAEngineLog( + __in TestEngine* pContext, + __in BAENGINE_LOG_ARGS* pArgs, + __in BAENGINE_LOG_RESULTS* /*pResults*/ + ); + + static HRESULT WINAPI EngineProc( + __in BOOTSTRAPPER_ENGINE_MESSAGE message, + __in const LPVOID pvArgs, + __inout LPVOID pvResults, + __in_opt LPVOID pvContext + ); + +public: + TestEngine(); + + ~TestEngine(); + +private: + BOOTSTRAPPER_CREATE_RESULTS* m_pCreateResults; +}; \ No newline at end of file diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config new file mode 100644 index 00000000..f209d5fb --- /dev/null +++ b/src/test/examples/TestEngine/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/test/examples/TestEngine/precomp.cpp b/src/test/examples/TestEngine/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/test/examples/TestEngine/precomp.cpp @@ -0,0 +1,3 @@ +// 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. + +#include "precomp.h" diff --git a/src/test/examples/TestEngine/precomp.h b/src/test/examples/TestEngine/precomp.h new file mode 100644 index 00000000..6e867e89 --- /dev/null +++ b/src/test/examples/TestEngine/precomp.h @@ -0,0 +1,19 @@ +#pragma once +// 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. + +#include +#include + +#include "dutil.h" +#include "conutil.h" +#include "logutil.h" +#include "memutil.h" + +#include "BootstrapperEngine.h" +#include "BootstrapperApplication.h" + +#include "TestEngine.h" + +HRESULT RunShutdownEngine( + __in LPCWSTR wzBAFilePath + ); -- cgit v1.2.3-55-g6feb From 7dc63e4df34a166a972be1559ed989426fca2945 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 22 Dec 2019 14:29:45 +1100 Subject: Update dependencies. --- src/Samples/bafunctions/bafunctions.vcxproj | 8 ++++---- src/Samples/bafunctions/packages.config | 4 ++-- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 8 ++++---- src/mbahost/packages.config | 4 ++-- .../examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | 6 +++--- src/test/examples/FullFramework2MBA/packages.config | 4 ++-- .../examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 8 ++++---- src/test/examples/TestEngine/packages.config | 4 ++-- src/wixstdba/packages.config | 4 ++-- src/wixstdba/wixstdba.vcxproj | 8 ++++---- 13 files changed, 32 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 22be1a35..469bb33b 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -57,8 +57,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index f209d5fb..fbcb6700 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index ccdd67cf..00e3bb88 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -44,7 +44,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.12\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index eee20511..3e954e88 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 30bffb54..c3bde6aa 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -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}. - - + + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index f209d5fb..fbcb6700 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,7 +1,7 @@  - - + + \ 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 dec1ff1e..3a884020 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 @@ -40,7 +40,7 @@ - ..\..\..\..\packages\WixToolset.Mba.Core.4.0.12\lib\net20\WixToolset.Mba.Core.dll + ..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll @@ -67,7 +67,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}. - + diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config index 77b7e398..6a2328ef 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 e044c6b1..04553354 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index ab79dacc..90002795 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -63,8 +63,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/packages.config b/src/test/examples/TestEngine/packages.config index f209d5fb..fbcb6700 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/wixstdba/packages.config b/src/wixstdba/packages.config index f209d5fb..fbcb6700 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index b0f767fb..b6c3ebc0 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -107,8 +107,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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}. - - + + -- cgit v1.2.3-55-g6feb From 08ab1a16349500606b76ba0c5d003c1c993710fb Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 31 Jan 2020 20:53:30 +1100 Subject: Update backend binder extension. --- src/wixext/BalWindowsInstallerBackendBinderExtension.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs index 3dc00da6..e53087b7 100644 --- a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs +++ b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs @@ -3,6 +3,7 @@ namespace WixToolset.Bal { using System; + using System.Collections.Generic; using System.Linq; using System.Xml; using WixToolset.Data; @@ -16,7 +17,7 @@ namespace WixToolset.Bal { private static readonly TableDefinition[] Tables = LoadTables(); - protected override TableDefinition[] TableDefinitionsForTuples => Tables; + public override IEnumerable TableDefinitions => Tables; private static TableDefinition[] LoadTables() { -- cgit v1.2.3-55-g6feb From 16f6a68d0bb1a0d5892a8cef10b835acc4e2a317 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 31 Jan 2020 21:43:14 +1100 Subject: Add failing test for compiling a WixStdBa bundle. --- Bal.wixext.sln | 14 ++++++++ nuget.config | 1 + src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 35 ++++++++++++++++++ .../TestData/WixStdBa/Bundle.wxs | 15 ++++++++ .../WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 42 ++++++++++++++++++++++ .../WixToolsetTest.Bal.v3.ncrunchproject | 5 +++ 6 files changed, 112 insertions(+) create mode 100644 src/test/WixToolsetTest.Bal/BalExtensionFixture.cs create mode 100644 src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs create mode 100644 src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj create mode 100644 src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject (limited to 'src') diff --git a/Bal.wixext.sln b/Bal.wixext.sln index e74e99c3..84c30661 100644 --- a/Bal.wixext.sln +++ b/Bal.wixext.sln @@ -25,6 +25,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "src\test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -147,6 +149,18 @@ Global {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.Build.0 = Release|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.ActiveCfg = Release|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.Build.0 = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x64.ActiveCfg = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x64.Build.0 = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x86.ActiveCfg = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x86.Build.0 = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|Any CPU.Build.0 = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.ActiveCfg = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.Build.0 = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.ActiveCfg = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/nuget.config b/nuget.config index 06a49261..837b3770 100644 --- a/nuget.config +++ b/nuget.config @@ -2,6 +2,7 @@ + diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs new file mode 100644 index 00000000..c5a25948 --- /dev/null +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -0,0 +1,35 @@ +// 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. + +namespace WixToolsetTest.Bal +{ + using System.IO; + using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; + using Xunit; + + public class BalExtensionFixture + { + [Fact(Skip = "Test demonstrates failure")] + public void CanBuildUsingWixStdBa() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + } + } + } +} diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs new file mode 100644 index 00000000..3a37e8ec --- /dev/null +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj new file mode 100644 index 00000000..4523346c --- /dev/null +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -0,0 +1,42 @@ + + + + + + netcoreapp3.1 + false + + + + NU1701 + + + + + + + + + + + + + + + + + + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject new file mode 100644 index 00000000..7b5b2139 --- /dev/null +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From d5b89ecb2ba931cd5429e00a78b9457f8a63c6d2 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 30 Mar 2020 19:25:36 +1000 Subject: Upgrade to latest dependencies. Stop skipping CanBuildUsingWixStdBa. Fix memory leak in wixstdba. --- src/Samples/bafunctions/bafunctions.vcxproj | 8 ++++---- src/Samples/bafunctions/packages.config | 4 ++-- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 8 ++++---- src/mbahost/packages.config | 4 ++-- src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 4 +++- .../examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | 6 +++--- src/test/examples/FullFramework2MBA/packages.config | 2 +- .../examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 8 ++++---- src/test/examples/TestEngine/packages.config | 4 ++-- src/wixext/BalWindowsInstallerBackendBinderExtension.cs | 6 +++--- src/wixlib/bal.wixproj | 4 ++-- src/wixlib/packages.config | 2 +- src/wixstdba/WixStandardBootstrapperApplication.cpp | 4 +++- src/wixstdba/packages.config | 4 ++-- src/wixstdba/precomp.h | 3 ++- src/wixstdba/wixstdba.cpp | 7 +++++-- src/wixstdba/wixstdba.vcxproj | 8 ++++---- 20 files changed, 50 insertions(+), 42 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 469bb33b..a7b0c11a 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -57,8 +57,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index fbcb6700..56b68f10 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 00e3bb88..1bc39813 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -44,7 +44,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 3e954e88..9123df31 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index c3bde6aa..6dd6298f 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -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}. - - + + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index fbcb6700..56b68f10 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index c5a25948..06727afd 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -9,7 +9,7 @@ namespace WixToolsetTest.Bal public class BalExtensionFixture { - [Fact(Skip = "Test demonstrates failure")] + [Fact] public void CanBuildUsingWixStdBa() { using (var fs = new DisposableFileSystem()) @@ -17,12 +17,14 @@ namespace WixToolsetTest.Bal var baseFolder = fs.GetFolder(); var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); var compileResult = WixRunner.Execute(new[] { "build", Path.Combine(bundleSourceFolder, "Bundle.wxs"), "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), "-o", bundleFile, }); diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 3a884020..09348ac8 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 @@ -40,7 +40,7 @@ - ..\..\..\..\packages\WixToolset.Mba.Core.4.0.13\lib\net20\WixToolset.Mba.Core.dll + ..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll @@ -67,7 +67,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}. - + diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config index 6a2328ef..9950b1b6 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 04553354..549e096e 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index 90002795..44ba2c9b 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -63,8 +63,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/packages.config b/src/test/examples/TestEngine/packages.config index fbcb6700..56b68f10 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/wixext/BalWindowsInstallerBackendBinderExtension.cs b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs index e53087b7..3c116329 100644 --- a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs +++ b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs @@ -29,11 +29,11 @@ namespace WixToolset.Bal } } - public override void PostBackendBind(IBindResult result, WixOutput wixout) + public override void PostBackendBind(IBindResult result) { - base.PostBackendBind(result, wixout); + base.PostBackendBind(result); - var output = WindowsInstallerData.Load(wixout.Uri.AbsoluteUri, false); + var output = WindowsInstallerData.Load(result.Wixout, false); // Only process Bundles. if (OutputType.Bundle != output.Type) diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index fbac3baa..8594c9e7 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,7 +1,7 @@ - + {3444D952-F21C-496F-AB6B-56435BFD0787} @@ -59,7 +59,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}. - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 3ba2b904..25b4e6a9 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 6d2fd3e2..afc6a3ee 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -3726,7 +3726,8 @@ HRESULT CreateBootstrapperApplication( __in HRESULT hrHostInitialization, __in IBootstrapperEngine* pEngine, __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults, + __out IBootstrapperApplication** ppApplication ) { HRESULT hr = S_OK; @@ -3737,6 +3738,7 @@ HRESULT CreateBootstrapperApplication( pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; pResults->pvBootstrapperApplicationProcContext = pApplication; + *ppApplication = pApplication; pApplication = NULL; LExit: diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index fbcb6700..56b68f10 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/wixstdba/precomp.h b/src/wixstdba/precomp.h index 925a80ce..9c2b9f6a 100644 --- a/src/wixstdba/precomp.h +++ b/src/wixstdba/precomp.h @@ -52,5 +52,6 @@ HRESULT CreateBootstrapperApplication( __in HRESULT hrHostInitialization, __in IBootstrapperEngine* pEngine, __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults, + __out IBootstrapperApplication** ppApplication ); diff --git a/src/wixstdba/wixstdba.cpp b/src/wixstdba/wixstdba.cpp index f47c1f4e..2767c74e 100644 --- a/src/wixstdba/wixstdba.cpp +++ b/src/wixstdba/wixstdba.cpp @@ -3,6 +3,7 @@ #include "precomp.h" static HINSTANCE vhInstance = NULL; +static IBootstrapperApplication* vpApplication = NULL; extern "C" BOOL WINAPI DllMain( IN HINSTANCE hInstance, @@ -37,7 +38,7 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate( hr = BalInitializeFromCreateArgs(pArgs, &pEngine); ExitOnFailure(hr, "Failed to initialize Bal."); - hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults); + hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults, &vpApplication); BalExitOnFailure(hr, "Failed to create bootstrapper application interface."); LExit: @@ -49,6 +50,7 @@ LExit: extern "C" void WINAPI BootstrapperApplicationDestroy() { + ReleaseNullObject(vpApplication); BalUninitialize(); } @@ -64,7 +66,7 @@ extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate( BalInitialize(pEngine); - hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults); + hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication); BalExitOnFailure(hr, "Failed to create managed prerequisite bootstrapper application interface."); LExit: @@ -74,5 +76,6 @@ LExit: extern "C" void WINAPI MbaPrereqBootstrapperApplicationDestroy() { + ReleaseNullObject(vpApplication); BalUninitialize(); } diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index b6c3ebc0..009bdb54 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -107,8 +107,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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}. - - + + -- cgit v1.2.3-55-g6feb From 89815d0f075f86bac29db6fab15e5c27291fbfc5 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 6 Apr 2020 10:10:28 +1000 Subject: Update dependencies. --- appveyor.yml | 2 +- src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 13 +++++-------- .../WixToolsetTest.ManagedHost.csproj | 4 ++-- src/wixlib/bal.wixproj | 4 ++-- src/wixlib/packages.config | 2 +- 5 files changed, 11 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/appveyor.yml b/appveyor.yml index c1df03cc..7c686b04 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ branches: - master - develop -image: Visual Studio 2017 +image: Visual Studio 2019 version: 0.0.0.{build} configuration: Release diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 4523346c..84a38e56 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -21,10 +21,10 @@ - - - - + + + + @@ -34,9 +34,6 @@ - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index cb1d1c78..02b0b109 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -3,7 +3,7 @@ - netcoreapp2.1 + netcoreapp3.1 false @@ -24,7 +24,7 @@ - + diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 8594c9e7..2e6217cc 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,7 +1,7 @@ - + {3444D952-F21C-496F-AB6B-56435BFD0787} @@ -59,7 +59,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}. - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 25b4e6a9..d73f4d3a 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 9969392ff7024d2f1e257c2f6c5ce31fa0e839d3 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 6 Apr 2020 12:27:53 +1000 Subject: BalWindowsInstallerBackendBinderExtension is supposed to be a BurnBackendExtension. --- src/wixext/BalBurnBackendExtension.cs | 129 ++++++++++++++++++ src/wixext/BalExtensionFactory.cs | 2 +- .../BalWindowsInstallerBackendBinderExtension.cs | 145 --------------------- src/wixext/WixToolset.Bal.wixext.csproj | 1 - src/wixext/tables.xml | 41 ------ 5 files changed, 130 insertions(+), 188 deletions(-) create mode 100644 src/wixext/BalBurnBackendExtension.cs delete mode 100644 src/wixext/BalWindowsInstallerBackendBinderExtension.cs delete mode 100644 src/wixext/tables.xml (limited to 'src') diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs new file mode 100644 index 00000000..20609964 --- /dev/null +++ b/src/wixext/BalBurnBackendExtension.cs @@ -0,0 +1,129 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Linq; + using WixToolset.Data; + using WixToolset.Data.Burn; + using WixToolset.Data.WindowsInstaller; + using WixToolset.Data.WindowsInstaller.Rows; + using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; + + public class BalBurnBackendExtension : BaseBurnBackendExtension + { + public override void PostBackendBind(IBindResult result) + { + base.PostBackendBind(result); + + var output = WindowsInstallerData.Load(result.Wixout, false); + + // Only process Bundles. + if (OutputType.Bundle != output.Type) + { + return; + } + + var baTable = output.Tables["WixBootstrapperApplication"]; + var baRow = baTable.Rows[0]; + var baId = (string)baRow[0]; + if (null == baId) + { + return; + } + + var isStdBA = baId.StartsWith("WixStandardBootstrapperApplication"); + var isMBA = baId.StartsWith("ManagedBootstrapperApplicationHost"); + + if (isStdBA || isMBA) + { + this.VerifyBAFunctions(output); + } + + if (isMBA) + { + this.VerifyPrereqPackages(output); + } + } + + private void VerifyBAFunctions(WindowsInstallerData output) + { + Row baFunctionsRow = null; + var baFunctionsTable = output.Tables["WixBalBAFunctions"]; + foreach (var row in baFunctionsTable.Rows) + { + if (null == baFunctionsRow) + { + baFunctionsRow = row; + } + else + { + this.Messaging.Write(BalErrors.MultipleBAFunctions(row.SourceLineNumbers)); + } + } + + var payloadPropertiesTable = output.Tables["WixPayloadProperties"]; + var payloadPropertiesRows = payloadPropertiesTable.Rows.Cast(); + if (null == baFunctionsRow) + { + foreach (var payloadPropertiesRow in payloadPropertiesRows) + { + // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). + if (string.Equals(payloadPropertiesRow.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) + { + this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesRow.SourceLineNumbers)); + } + } + } + else + { + // TODO: May need to revisit this depending on the outcome of #5273. + var payloadId = (string)baFunctionsRow[0]; + var bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id); + if (BurnConstants.BurnUXContainerName != bundlePayloadRow.Container) + { + this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers)); + } + } + } + + private void VerifyPrereqPackages(WindowsInstallerData output) + { + var prereqInfoTable = output.Tables["WixMbaPrereqInformation"]; + if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0) + { + this.Messaging.Write(BalErrors.MissingPrereq()); + return; + } + + var foundLicenseFile = false; + var foundLicenseUrl = false; + + foreach (Row prereqInfoRow in prereqInfoTable.Rows) + { + if (null != prereqInfoRow[1]) + { + if (foundLicenseFile || foundLicenseUrl) + { + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); + return; + } + + foundLicenseFile = true; + } + + if (null != prereqInfoRow[2]) + { + if (foundLicenseFile || foundLicenseUrl) + { + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); + return; + } + + foundLicenseUrl = true; + } + } + } + } +} diff --git a/src/wixext/BalExtensionFactory.cs b/src/wixext/BalExtensionFactory.cs index 936686a6..30ec88c3 100644 --- a/src/wixext/BalExtensionFactory.cs +++ b/src/wixext/BalExtensionFactory.cs @@ -12,7 +12,7 @@ namespace WixToolset.Bal { typeof(BalCompiler), typeof(BalExtensionData), - typeof(BalWindowsInstallerBackendBinderExtension), + typeof(BalBurnBackendExtension), }; } } diff --git a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs b/src/wixext/BalWindowsInstallerBackendBinderExtension.cs deleted file mode 100644 index 3c116329..00000000 --- a/src/wixext/BalWindowsInstallerBackendBinderExtension.cs +++ /dev/null @@ -1,145 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using System; - using System.Collections.Generic; - using System.Linq; - using System.Xml; - using WixToolset.Data; - using WixToolset.Data.Burn; - using WixToolset.Data.WindowsInstaller; - using WixToolset.Data.WindowsInstaller.Rows; - using WixToolset.Extensibility; - using WixToolset.Extensibility.Data; - - public class BalWindowsInstallerBackendBinderExtension : BaseWindowsInstallerBackendBinderExtension - { - private static readonly TableDefinition[] Tables = LoadTables(); - - public override IEnumerable TableDefinitions => Tables; - - private static TableDefinition[] LoadTables() - { - using (var resourceStream = typeof(BalWindowsInstallerBackendBinderExtension).Assembly.GetManifestResourceStream("WixToolset.Bal.tables.xml")) - using (var reader = XmlReader.Create(resourceStream)) - { - var tables = TableDefinitionCollection.Load(reader); - return tables.ToArray(); - } - } - - public override void PostBackendBind(IBindResult result) - { - base.PostBackendBind(result); - - var output = WindowsInstallerData.Load(result.Wixout, false); - - // Only process Bundles. - if (OutputType.Bundle != output.Type) - { - return; - } - - var baTable = output.Tables["WixBootstrapperApplication"]; - var baRow = baTable.Rows[0]; - var baId = (string)baRow[0]; - if (null == baId) - { - return; - } - - var isStdBA = baId.StartsWith("WixStandardBootstrapperApplication"); - var isMBA = baId.StartsWith("ManagedBootstrapperApplicationHost"); - - if (isStdBA || isMBA) - { - this.VerifyBAFunctions(output); - } - - if (isMBA) - { - this.VerifyPrereqPackages(output); - } - } - - private void VerifyBAFunctions(WindowsInstallerData output) - { - Row baFunctionsRow = null; - var baFunctionsTable = output.Tables["WixBalBAFunctions"]; - foreach (var row in baFunctionsTable.Rows) - { - if (null == baFunctionsRow) - { - baFunctionsRow = row; - } - else - { - this.Messaging.Write(BalErrors.MultipleBAFunctions(row.SourceLineNumbers)); - } - } - - var payloadPropertiesTable = output.Tables["WixPayloadProperties"]; - var payloadPropertiesRows = payloadPropertiesTable.Rows.Cast(); - if (null == baFunctionsRow) - { - foreach (var payloadPropertiesRow in payloadPropertiesRows) - { - // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). - if (string.Equals(payloadPropertiesRow.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) - { - this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesRow.SourceLineNumbers)); - } - } - } - else - { - // TODO: May need to revisit this depending on the outcome of #5273. - var payloadId = (string)baFunctionsRow[0]; - var bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id); - if (BurnConstants.BurnUXContainerName != bundlePayloadRow.Container) - { - this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers)); - } - } - } - - private void VerifyPrereqPackages(WindowsInstallerData output) - { - var prereqInfoTable = output.Tables["WixMbaPrereqInformation"]; - if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0) - { - this.Messaging.Write(BalErrors.MissingPrereq()); - return; - } - - var foundLicenseFile = false; - var foundLicenseUrl = false; - - foreach (Row prereqInfoRow in prereqInfoTable.Rows) - { - if (null != prereqInfoRow[1]) - { - if (foundLicenseFile || foundLicenseUrl) - { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); - return; - } - - foundLicenseFile = true; - } - - if (null != prereqInfoRow[2]) - { - if (foundLicenseFile || foundLicenseUrl) - { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); - return; - } - - foundLicenseUrl = true; - } - } - } - } -} diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index 49f891d3..aef4c4d9 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -13,7 +13,6 @@ - diff --git a/src/wixext/tables.xml b/src/wixext/tables.xml deleted file mode 100644 index 18abf1d7..00000000 --- a/src/wixext/tables.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3-55-g6feb From 18752ee7da742d0219e7b882315e03ad888f5725 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 6 Apr 2020 12:30:56 +1000 Subject: Modernize BalCompiler and BalBurnBackendExtension. --- src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 5 + src/wixext/BalBurnBackendExtension.cs | 71 ++++--- src/wixext/BalCompiler.cs | 203 +++++++++++---------- 3 files changed, 150 insertions(+), 129 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 06727afd..e798063e 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -3,6 +3,7 @@ namespace WixToolsetTest.Bal { using System.IO; + using System.Linq; using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using Xunit; @@ -29,6 +30,10 @@ namespace WixToolsetTest.Bal "-o", bundleFile, }); compileResult.AssertSuccess(); + Assert.Equal(new[] + { + "BurnBackend didn't provide Wixout so skipping BalExtension PostBind verification." + }, compileResult.Messages.Select(x => x.ToString()).ToArray()); Assert.True(File.Exists(bundleFile)); } diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index 20609964..e1082889 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -4,10 +4,10 @@ namespace WixToolset.Bal { using System; using System.Linq; + using WixToolset.Bal.Tuples; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.WindowsInstaller; - using WixToolset.Data.WindowsInstaller.Rows; + using WixToolset.Data.Tuples; using WixToolset.Extensibility; using WixToolset.Extensibility.Data; @@ -17,17 +17,17 @@ namespace WixToolset.Bal { base.PostBackendBind(result); - var output = WindowsInstallerData.Load(result.Wixout, false); - - // Only process Bundles. - if (OutputType.Bundle != output.Type) + if (result.Wixout == null) { + this.Messaging.Write(new Message(null, MessageLevel.Warning, 1, "BurnBackend didn't provide Wixout so skipping BalExtension PostBind verification.")); return; } - var baTable = output.Tables["WixBootstrapperApplication"]; - var baRow = baTable.Rows[0]; - var baId = (string)baRow[0]; + var intermediate = Intermediate.Load(result.Wixout); + var section = intermediate.Sections.Single(); + + var baTuple = section.Tuples.OfType().SingleOrDefault(); + var baId = baTuple?.Id?.Id; if (null == baId) { return; @@ -38,60 +38,57 @@ namespace WixToolset.Bal if (isStdBA || isMBA) { - this.VerifyBAFunctions(output); + this.VerifyBAFunctions(section); } if (isMBA) { - this.VerifyPrereqPackages(output); + this.VerifyPrereqPackages(section); } } - private void VerifyBAFunctions(WindowsInstallerData output) + private void VerifyBAFunctions(IntermediateSection section) { - Row baFunctionsRow = null; - var baFunctionsTable = output.Tables["WixBalBAFunctions"]; - foreach (var row in baFunctionsTable.Rows) + WixBalBAFunctionsTuple baFunctionsTuple = null; + foreach (var tuple in section.Tuples.OfType()) { - if (null == baFunctionsRow) + if (null == baFunctionsTuple) { - baFunctionsRow = row; + baFunctionsTuple = tuple; } else { - this.Messaging.Write(BalErrors.MultipleBAFunctions(row.SourceLineNumbers)); + this.Messaging.Write(BalErrors.MultipleBAFunctions(tuple.SourceLineNumbers)); } } - var payloadPropertiesTable = output.Tables["WixPayloadProperties"]; - var payloadPropertiesRows = payloadPropertiesTable.Rows.Cast(); - if (null == baFunctionsRow) + var payloadPropertiesTuples = section.Tuples.OfType().ToList(); + if (null == baFunctionsTuple) { - foreach (var payloadPropertiesRow in payloadPropertiesRows) + foreach (var payloadPropertiesTuple in payloadPropertiesTuples) { // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). - if (string.Equals(payloadPropertiesRow.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(payloadPropertiesTuple.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) { - this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesRow.SourceLineNumbers)); + this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesTuple.SourceLineNumbers)); } } } else { - // TODO: May need to revisit this depending on the outcome of #5273. - var payloadId = (string)baFunctionsRow[0]; - var bundlePayloadRow = payloadPropertiesRows.Single(x => payloadId == x.Id); - if (BurnConstants.BurnUXContainerName != bundlePayloadRow.Container) + var payloadId = baFunctionsTuple.Id; + var bundlePayloadTuple = payloadPropertiesTuples.Single(x => payloadId == x.Id); + if (BurnConstants.BurnUXContainerName != bundlePayloadTuple.ContainerRef) { - this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsRow.SourceLineNumbers)); + this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsTuple.SourceLineNumbers)); } } } - private void VerifyPrereqPackages(WindowsInstallerData output) + private void VerifyPrereqPackages(IntermediateSection section) { - var prereqInfoTable = output.Tables["WixMbaPrereqInformation"]; - if (null == prereqInfoTable || prereqInfoTable.Rows.Count == 0) + var prereqInfoTuples = section.Tuples.OfType().ToList(); + if (prereqInfoTuples.Count == 0) { this.Messaging.Write(BalErrors.MissingPrereq()); return; @@ -100,24 +97,24 @@ namespace WixToolset.Bal var foundLicenseFile = false; var foundLicenseUrl = false; - foreach (Row prereqInfoRow in prereqInfoTable.Rows) + foreach (var prereqInfoTuple in prereqInfoTuples) { - if (null != prereqInfoRow[1]) + if (null != prereqInfoTuple.LicenseFile) { if (foundLicenseFile || foundLicenseUrl) { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers)); return; } foundLicenseFile = true; } - if (null != prereqInfoRow[2]) + if (null != prereqInfoTuple.LicenseUrl) { if (foundLicenseFile || foundLicenseUrl) { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoRow.SourceLineNumbers)); + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers)); return; } diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index c9b232ba..c291d41f 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -15,16 +15,14 @@ namespace WixToolset.Bal /// public sealed class BalCompiler : BaseCompilerExtension { - private SourceLineNumber addedConditionLineNumber; - private Dictionary prereqInfoRows; + private readonly Dictionary prereqInfoTuplesByPackageId; /// /// Instantiate a new BalCompiler. /// public BalCompiler() { - this.addedConditionLineNumber = null; - this.prereqInfoRows = new Dictionary(); + this.prereqInfoTuplesByPackageId = new Dictionary(); } public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/bal"; @@ -82,7 +80,7 @@ namespace WixToolset.Bal /// Extra information about the context in which this element is being parsed. public override void ParseAttribute(Intermediate intermediate, IntermediateSection section, XElement parentElement, XAttribute attribute, IDictionary context) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(parentElement); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(parentElement); WixMbaPrereqInformationTuple prereqInfo; switch (parentElement.Name.LocalName) @@ -102,18 +100,20 @@ namespace WixToolset.Bal { case "PrereqLicenseFile": - if (!this.prereqInfoRows.TryGetValue(packageId, out prereqInfo)) + if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) { // at the time the extension attribute is parsed, the compiler might not yet have // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. - XAttribute prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); + var prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixMbaPrereqInformation"); - prereqInfo.PackageId = packageId; + prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + { + PackageId = packageId, + }); - this.prereqInfoRows.Add(packageId, prereqInfo); + this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo); } else { @@ -133,18 +133,20 @@ namespace WixToolset.Bal break; case "PrereqLicenseUrl": - if (!this.prereqInfoRows.TryGetValue(packageId, out prereqInfo)) + if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) { // at the time the extension attribute is parsed, the compiler might not yet have // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. - XAttribute prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); + var prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixMbaPrereqInformation"); - prereqInfo.PackageId = packageId; + prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + { + PackageId = packageId, + }); - this.prereqInfoRows.Add(packageId, prereqInfo); + this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo); } else { @@ -165,12 +167,14 @@ namespace WixToolset.Bal case "PrereqPackage": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - if (!this.prereqInfoRows.TryGetValue(packageId, out prereqInfo)) + if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) { - prereqInfo = (WixMbaPrereqInformationTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixMbaPrereqInformation"); - prereqInfo.PackageId = packageId; + prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + { + PackageId = packageId, + }); - this.prereqInfoRows.Add(packageId, prereqInfo); + this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo); } } break; @@ -193,8 +197,10 @@ namespace WixToolset.Bal case "BAFunctions": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - var tuple = (WixBalBAFunctionsTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBalBAFunctions"); - tuple.PayloadId = payloadId; + section.AddTuple(new WixBalBAFunctionsTuple(sourceLineNumbers) + { + PayloadId = payloadId, + }); } break; default: @@ -206,7 +212,7 @@ namespace WixToolset.Bal case "Variable": // at the time the extension attribute is parsed, the compiler might not yet have // parsed the Name attribute, so we need to get it directly from the parent element. - XAttribute variableName = parentElement.Attribute("Name"); + var variableName = parentElement.Attribute("Name"); if (null == variableName) { this.Messaging.Write(ErrorMessages.ExpectedParentWithAttribute(sourceLineNumbers, "Variable", "Overridable", "Name")); @@ -218,8 +224,10 @@ namespace WixToolset.Bal case "Overridable": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - var tuple = (WixStdbaOverridableVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixStdbaOverridableVariable"); - tuple.Name = variableName.Value; + section.AddTuple(new WixStdbaOverridableVariableTuple(sourceLineNumbers) + { + Name = variableName.Value, + }); } break; default: @@ -237,11 +245,11 @@ namespace WixToolset.Bal /// The element to parse. private void ParseConditionElement(Intermediate intermediate, IntermediateSection section, XElement node) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - string condition = this.ParseHelper.GetConditionInnerText(node); // condition is the inner text of the element. + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + var condition = this.ParseHelper.GetConditionInnerText(node); // condition is the inner text of the element. string message = null; - foreach (XAttribute attrib in node.Attributes()) + foreach (var attrib in node.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -276,14 +284,11 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { - var tuple = (WixBalConditionTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBalCondition"); - tuple.Condition = condition; - tuple.Message = message; - - if (null == this.addedConditionLineNumber) + section.AddTuple(new WixBalConditionTuple(sourceLineNumbers) { - this.addedConditionLineNumber = sourceLineNumbers; - } + Condition = condition, + Message = message, + }); } } @@ -293,11 +298,11 @@ namespace WixToolset.Bal /// The element to parse. private void ParseWixStandardBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); string launchTarget = null; string launchTargetElevatedId = null; string launchArguments = null; - YesNoType launchHidden = YesNoType.NotSet; + var launchHidden = YesNoType.NotSet; string launchWorkingDir = null; string licenseFile = null; string licenseUrl = null; @@ -305,13 +310,13 @@ namespace WixToolset.Bal string logoSideFile = null; string themeFile = null; string localizationFile = null; - YesNoType suppressOptionsUI = YesNoType.NotSet; - YesNoType suppressDowngradeFailure = YesNoType.NotSet; - YesNoType suppressRepair = YesNoType.NotSet; - YesNoType showVersion = YesNoType.NotSet; - YesNoType supportCacheOnly = YesNoType.NotSet; + var suppressOptionsUI = YesNoType.NotSet; + var suppressDowngradeFailure = YesNoType.NotSet; + var suppressRepair = YesNoType.NotSet; + var showVersion = YesNoType.NotSet; + var supportCacheOnly = YesNoType.NotSet; - foreach (XAttribute attrib in node.Attributes()) + foreach (var attrib in node.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -387,90 +392,101 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(launchTarget)) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable"); - row.Id = new Identifier(AccessModifier.Public, "LaunchTarget"); - row.Value = launchTarget; - row.Type = "string"; + section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) + { + Value = launchTarget, + Type = "string", + }); } if (!String.IsNullOrEmpty(launchTargetElevatedId)) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable"); - row.Id = new Identifier(AccessModifier.Public, "LaunchTargetElevatedId"); - row.Value = launchTargetElevatedId; - row.Type = "string"; + section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId")) + { + Value = launchTargetElevatedId, + Type = "string", + }); } if (!String.IsNullOrEmpty(launchArguments)) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable"); - row.Id = new Identifier(AccessModifier.Public, "LaunchArguments"); - row.Value = launchArguments; - row.Type = "string"; + section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments")) + { + Value = launchArguments, + Type = "string", + }); } if (YesNoType.Yes == launchHidden) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixBundleVariable"); - row.Id = new Identifier(AccessModifier.Public, "LaunchHidden"); - row.Value = "yes"; - row.Type = "string"; + section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden")) + { + Value = "yes", + Type = "string", + }); } if (!String.IsNullOrEmpty(launchWorkingDir)) { - var row = (WixBundleVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "Variable"); - row.Id = new Identifier(AccessModifier.Public, "LaunchWorkingFolder"); - row.Value = launchWorkingDir; - row.Type = "string"; + section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder")) + { + Value = launchWorkingDir, + Type = "string", + }); } if (!String.IsNullOrEmpty(licenseFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf"); - wixVariableRow.Value = licenseFile; + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf")) + { + Value = licenseFile, + }); } if (null != licenseUrl) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl"); - wixVariableRow.Value = licenseUrl; + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl")) + { + Value = licenseUrl, + }); } if (!String.IsNullOrEmpty(logoFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLogo"); - wixVariableRow.Value = logoFile; + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo")) + { + Value = logoFile, + }); } if (!String.IsNullOrEmpty(logoSideFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaLogoSide"); - wixVariableRow.Value = logoSideFile; + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide")) + { + Value = logoSideFile, + }); } if (!String.IsNullOrEmpty(themeFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaThemeXml"); - wixVariableRow.Value = themeFile; + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml")) + { + Value = themeFile, + }); } if (!String.IsNullOrEmpty(localizationFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier(AccessModifier.Public, "WixStdbaThemeWxl"); - wixVariableRow.Value = localizationFile; + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl")) + { + Value = localizationFile, + }); } if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly) { - var tuple = (WixStdbaOptionsTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixStdbaOptions"); + var tuple = section.AddTuple(new WixStdbaOptionsTuple(sourceLineNumbers)); if (YesNoType.Yes == suppressOptionsUI) { tuple.SuppressOptionsUI = 1; @@ -505,12 +521,12 @@ namespace WixToolset.Bal /// The element to parse. private void ParseWixManagedBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node) { - SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); string logoFile = null; string themeFile = null; string localizationFile = null; - foreach (XAttribute attrib in node.Attributes()) + foreach (var attrib in node.Attributes()) { if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) { @@ -542,23 +558,26 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(logoFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier(AccessModifier.Public, "PreqbaLogo"); - wixVariableRow.Value = logoFile; + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) + { + Value = logoFile, + }); } if (!String.IsNullOrEmpty(themeFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier(AccessModifier.Public, "PreqbaThemeXml"); - wixVariableRow.Value = themeFile; + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml")) + { + Value = themeFile, + }); } if (!String.IsNullOrEmpty(localizationFile)) { - var wixVariableRow = (WixVariableTuple)this.ParseHelper.CreateTuple(section, sourceLineNumbers, "WixVariable"); - wixVariableRow.Id = new Identifier(AccessModifier.Public, "PreqbaThemeWxl"); - wixVariableRow.Value = localizationFile; + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl")) + { + Value = localizationFile, + }); } } } -- cgit v1.2.3-55-g6feb From 0e6972aecab5eeef12f6209949d8a0b67a4b7d2a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 13 Apr 2020 20:22:17 +1000 Subject: Update dependencies. --- src/Cpp.Build.props | 16 ---------------- src/wixlib/bal.wixproj | 4 ++-- src/wixlib/packages.config | 2 +- 3 files changed, 3 insertions(+), 19 deletions(-) (limited to 'src') diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 864f0fcd..9b7a1bb5 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -11,10 +11,6 @@ $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - 4564;4691 - @@ -74,12 +70,6 @@ MultiThreadedDebug - - - - MultiThreadedDebugDll - - MinSpace @@ -93,10 +83,4 @@ true - - - - MultiThreadedDll - - diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 2e6217cc..51268803 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,7 +1,7 @@ - + {3444D952-F21C-496F-AB6B-56435BFD0787} @@ -59,7 +59,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}. - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index d73f4d3a..1e5a9850 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 946837a7462fe6afe6b5f29d816e91c3ecda1c11 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 21 Apr 2020 17:38:39 +1000 Subject: Update dependencies. --- src/Samples/bafunctions/bafunctions.vcxproj | 8 ++++---- src/Samples/bafunctions/packages.config | 4 ++-- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 8 ++++---- src/mbahost/packages.config | 4 ++-- src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 4 ---- .../examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | 6 +++--- src/test/examples/FullFramework2MBA/packages.config | 2 +- .../examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 8 ++++---- src/test/examples/TestEngine/packages.config | 4 ++-- src/wixstdba/WixStandardBootstrapperApplication.cpp | 3 ++- src/wixstdba/packages.config | 4 ++-- src/wixstdba/wixstdba.vcxproj | 8 ++++---- 15 files changed, 33 insertions(+), 36 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index a7b0c11a..89c7b553 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -57,8 +57,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 56b68f10..bb4c9d19 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 1bc39813..5d08e607 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -44,7 +44,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.18\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 9123df31..0fa223c0 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 6dd6298f..cdcea2a4 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -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}. - - + + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 56b68f10..bb4c9d19 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index e798063e..d93ed74a 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -30,10 +30,6 @@ namespace WixToolsetTest.Bal "-o", bundleFile, }); compileResult.AssertSuccess(); - Assert.Equal(new[] - { - "BurnBackend didn't provide Wixout so skipping BalExtension PostBind verification." - }, compileResult.Messages.Select(x => x.ToString()).ToArray()); Assert.True(File.Exists(bundleFile)); } diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 09348ac8..494d1987 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 @@ -40,7 +40,7 @@ - ..\..\..\..\packages\WixToolset.Mba.Core.4.0.16\lib\net20\WixToolset.Mba.Core.dll + ..\..\..\..\packages\WixToolset.Mba.Core.4.0.18\lib\net20\WixToolset.Mba.Core.dll @@ -67,7 +67,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}. - + diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config index 9950b1b6..59d81db0 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 549e096e..40f6d008 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -7,7 +7,7 @@ - + diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index 44ba2c9b..554d54f6 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -63,8 +63,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/packages.config b/src/test/examples/TestEngine/packages.config index 56b68f10..bb4c9d19 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/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index afc6a3ee..2a05b1cb 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -705,6 +705,7 @@ public: // IBootstrapperApplication virtual STDMETHODIMP OnExecutePackageBegin( __in_z LPCWSTR wzPackageId, __in BOOL fExecute, + __in BOOTSTRAPPER_ACTION_STATE action, __inout BOOL* pfCancel ) { @@ -759,7 +760,7 @@ public: // IBootstrapperApplication } ReleaseStr(sczFormattedString); - return __super::OnExecutePackageBegin(wzPackageId, fExecute, pfCancel); + return __super::OnExecutePackageBegin(wzPackageId, fExecute, action, pfCancel); } diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 56b68f10..bb4c9d19 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 009bdb54..1c55d41a 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -107,8 +107,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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}. - - + + -- cgit v1.2.3-55-g6feb From b58b204df1be70c95a5393ff22ed0f7afa0a0068 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 21 Apr 2020 17:48:07 +1000 Subject: WIXBUG:6158 - Fix bug with m_fShowingInternalUiThisPackage where it was calculated with the bundle action instead of the package action. --- src/wixstdba/WixStandardBootstrapperApplication.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 2a05b1cb..e78b37b0 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -748,8 +748,12 @@ public: // IBootstrapperApplication wz = sczFormattedString ? sczFormattedString : pPackage->sczDisplayName ? pPackage->sczDisplayName : wzPackageId; } - //Burn engine doesn't show internal UI for msi packages during uninstall or repair actions. - m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && BOOTSTRAPPER_ACTION_UNINSTALL != m_plannedAction && BOOTSTRAPPER_ACTION_REPAIR != m_plannedAction; + // Needs to match MsiEngineCalculateInstallUiLevel in msiengine.cpp in Burn. + m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && + BOOTSTRAPPER_ACTION_STATE_UNINSTALL != action && + BOOTSTRAPPER_ACTION_STATE_REPAIR != action && + (BOOTSTRAPPER_DISPLAY_FULL == m_command.display || + BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display); ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz); ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); -- cgit v1.2.3-55-g6feb From 6585189c97d73dee54a490e1c98f1872f422f7c0 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 21 Apr 2020 18:02:51 +1000 Subject: WIXBUG:4342 - Force cancel if m_fShowingInternalUiThisPackage Add critical section for m_fShowingInternalUiThisPackage since OnExecutePackageBegin happens on the Burn thread and OnClose happens on the UI thread. --- .../WixStandardBootstrapperApplication.cpp | 36 +++++++++++++++------- 1 file changed, 25 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index e78b37b0..4aef8ce5 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -709,7 +709,9 @@ public: // IBootstrapperApplication __inout BOOL* pfCancel ) { + HRESULT hr = S_OK; LPWSTR sczFormattedString = NULL; + BOOL fShowingInternalUiThisPackage = FALSE; m_fStartedExecution = TRUE; @@ -749,22 +751,23 @@ public: // IBootstrapperApplication } // Needs to match MsiEngineCalculateInstallUiLevel in msiengine.cpp in Burn. - m_fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && - BOOTSTRAPPER_ACTION_STATE_UNINSTALL != action && - BOOTSTRAPPER_ACTION_STATE_REPAIR != action && - (BOOTSTRAPPER_DISPLAY_FULL == m_command.display || - BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display); + fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && + BOOTSTRAPPER_ACTION_STATE_UNINSTALL != action && + BOOTSTRAPPER_ACTION_STATE_REPAIR != action && + (BOOTSTRAPPER_DISPLAY_FULL == m_command.display || + BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display); ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz); ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); } - else - { - m_fShowingInternalUiThisPackage = FALSE; - } + + ::EnterCriticalSection(&m_csShowingInternalUiThisPackage); + m_fShowingInternalUiThisPackage = fShowingInternalUiThisPackage; + hr = __super::OnExecutePackageBegin(wzPackageId, fExecute, action, pfCancel); + ::LeaveCriticalSection(&m_csShowingInternalUiThisPackage); ReleaseStr(sczFormattedString); - return __super::OnExecutePackageBegin(wzPackageId, fExecute, action, pfCancel); + return hr; } @@ -837,6 +840,7 @@ public: // IBootstrapperApplication ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, L""); ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, L""); ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, FALSE); // no more cancel. + m_fShowingInternalUiThisPackage = FALSE; SetState(WIXSTDBA_STATE_EXECUTED, S_OK); // we always return success here and let OnApplyComplete() deal with the error. SetProgressState(hrStatus); @@ -2975,7 +2979,14 @@ private: // privates } else // prompt the user or force the cancel if there is no UI. { - fClose = PromptCancel(m_hWnd, BOOTSTRAPPER_DISPLAY_FULL != m_command.display, m_sczConfirmCloseMessage ? m_sczConfirmCloseMessage : L"Are you sure you want to cancel?", m_pTheme->sczCaption); + ::EnterCriticalSection(&m_csShowingInternalUiThisPackage); + fClose = PromptCancel( + m_hWnd, + BOOTSTRAPPER_DISPLAY_FULL != m_command.display || m_fShowingInternalUiThisPackage, + m_sczConfirmCloseMessage ? m_sczConfirmCloseMessage : L"Are you sure you want to cancel?", + m_pTheme->sczCaption); + ::LeaveCriticalSection(&m_csShowingInternalUiThisPackage); + fCancel = fClose; } @@ -3607,6 +3618,7 @@ public: m_pTaskbarList = NULL; m_uTaskbarButtonCreatedMessage = UINT_MAX; m_fTaskbarButtonOK = FALSE; + ::InitializeCriticalSection(&m_csShowingInternalUiThisPackage); m_fShowingInternalUiThisPackage = FALSE; m_fTriedToLaunchElevated = FALSE; @@ -3631,6 +3643,7 @@ public: AssertSz(!::IsWindow(m_hWnd), "Window should have been destroyed before destructor."); AssertSz(!m_pTheme, "Theme should have been released before destructor."); + ::DeleteCriticalSection(&m_csShowingInternalUiThisPackage); ReleaseObject(m_pTaskbarList); ReleaseDict(m_sdOverridableVariables); ReleaseDict(m_shPrereqSupportPackages); @@ -3713,6 +3726,7 @@ private: ITaskbarList3* m_pTaskbarList; UINT m_uTaskbarButtonCreatedMessage; BOOL m_fTaskbarButtonOK; + CRITICAL_SECTION m_csShowingInternalUiThisPackage; BOOL m_fShowingInternalUiThisPackage; BOOL m_fTriedToLaunchElevated; -- cgit v1.2.3-55-g6feb From d686f0d92fc14940441dbf53c28547a975572f92 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 23 Apr 2020 12:01:31 +1000 Subject: Add ManagedBootstrapperApplicationPrereqInformation element to move prereq info back to NetFx. --- src/wixext/BalCompiler.cs | 65 +++++++++++++++++++++++++++++++++++++ src/wixext/bal.xsd | 29 +++++++++++++++++ src/wixlib/NetFx451AsPrereq.wxs | 34 -------------------- src/wixlib/NetFx452AsPrereq.wxs | 34 -------------------- src/wixlib/NetFx45AsPrereq.wxs | 34 -------------------- src/wixlib/NetFx461AsPrereq.wxs | 34 -------------------- src/wixlib/NetFx462AsPrereq.wxs | 34 -------------------- src/wixlib/NetFx46AsPrereq.wxs | 34 -------------------- src/wixlib/NetFx4AsPrereq.wxs | 71 ----------------------------------------- src/wixlib/bal.wixproj | 7 ---- 10 files changed, 94 insertions(+), 282 deletions(-) delete mode 100644 src/wixlib/NetFx451AsPrereq.wxs delete mode 100644 src/wixlib/NetFx452AsPrereq.wxs delete mode 100644 src/wixlib/NetFx45AsPrereq.wxs delete mode 100644 src/wixlib/NetFx461AsPrereq.wxs delete mode 100644 src/wixlib/NetFx462AsPrereq.wxs delete mode 100644 src/wixlib/NetFx46AsPrereq.wxs delete mode 100644 src/wixlib/NetFx4AsPrereq.wxs (limited to 'src') diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index c291d41f..da32234c 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -46,6 +46,9 @@ namespace WixToolset.Bal case "Condition": this.ParseConditionElement(intermediate, section, element); break; + case "ManagedBootstrapperApplicationPrereqInformation": + this.ParseMbaPrereqInfoElement(intermediate, section, element); + break; default: this.ParseHelper.UnexpectedElement(parentElement, element); break; @@ -292,6 +295,68 @@ namespace WixToolset.Bal } } + /// + /// Parses a Condition element for Bundles. + /// + /// The element to parse. + private void ParseMbaPrereqInfoElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + string packageId = null; + string licenseFile = null; + string licenseUrl = null; + + foreach (var attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "LicenseFile": + licenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LicenseUrl": + licenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "PackageId": + packageId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + + if (null == packageId) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PackageId")); + } + + if (null == licenseFile && null == licenseUrl || + null != licenseFile && null != licenseUrl) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true)); + } + + if (!this.Messaging.EncounteredError) + { + section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + { + PackageId = packageId, + LicenseFile = licenseFile, + LicenseUrl = licenseUrl, + }); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixBundlePackage, packageId); + } + } + /// /// Parses a WixStandardBootstrapperApplication element for Bundles. /// diff --git a/src/wixext/bal.xsd b/src/wixext/bal.xsd index 73f10540..3081a279 100644 --- a/src/wixext/bal.xsd +++ b/src/wixext/bal.xsd @@ -186,6 +186,35 @@ + + + + Adds license information for a prereq package, should only be used when unable to add the license attributes to the package directly. + + + + + + + + + + Id of the target package. + + + + + Source file of the license. May not be used with LicenseUrl. + + + + + Source url of the license. May not be used with LicenseFile. + + + + + diff --git a/src/wixlib/NetFx451AsPrereq.wxs b/src/wixlib/NetFx451AsPrereq.wxs deleted file mode 100644 index 67c05b05..00000000 --- a/src/wixlib/NetFx451AsPrereq.wxs +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - $(var.NetFx451WebId) - $(var.NetFx451EulaLink) - - - - - - - - - - - - - $(var.NetFx451RedistId) - $(var.NetFx451EulaLink) - - - - diff --git a/src/wixlib/NetFx452AsPrereq.wxs b/src/wixlib/NetFx452AsPrereq.wxs deleted file mode 100644 index b41a9986..00000000 --- a/src/wixlib/NetFx452AsPrereq.wxs +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - $(var.NetFx452WebId) - $(var.NetFx452EulaLink) - - - - - - - - - - - - - $(var.NetFx452RedistId) - $(var.NetFx452EulaLink) - - - - diff --git a/src/wixlib/NetFx45AsPrereq.wxs b/src/wixlib/NetFx45AsPrereq.wxs deleted file mode 100644 index b95fc8a4..00000000 --- a/src/wixlib/NetFx45AsPrereq.wxs +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - $(var.NetFx45WebId) - $(var.NetFx45EulaLink) - - - - - - - - - - - - - $(var.NetFx45RedistId) - $(var.NetFx45EulaLink) - - - - diff --git a/src/wixlib/NetFx461AsPrereq.wxs b/src/wixlib/NetFx461AsPrereq.wxs deleted file mode 100644 index d6b24b43..00000000 --- a/src/wixlib/NetFx461AsPrereq.wxs +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - $(var.NetFx461WebId) - $(var.NetFx461EulaLink) - - - - - - - - - - - - - $(var.NetFx461RedistId) - $(var.NetFx461EulaLink) - - - - diff --git a/src/wixlib/NetFx462AsPrereq.wxs b/src/wixlib/NetFx462AsPrereq.wxs deleted file mode 100644 index e6f6889a..00000000 --- a/src/wixlib/NetFx462AsPrereq.wxs +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - $(var.NetFx462WebId) - $(var.NetFx462EulaLink) - - - - - - - - - - - - - $(var.NetFx462RedistId) - $(var.NetFx462EulaLink) - - - - diff --git a/src/wixlib/NetFx46AsPrereq.wxs b/src/wixlib/NetFx46AsPrereq.wxs deleted file mode 100644 index 52880022..00000000 --- a/src/wixlib/NetFx46AsPrereq.wxs +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - $(var.NetFx46WebId) - $(var.NetFx46EulaLink) - - - - - - - - - - - - - $(var.NetFx46RedistId) - $(var.NetFx46EulaLink) - - - - diff --git a/src/wixlib/NetFx4AsPrereq.wxs b/src/wixlib/NetFx4AsPrereq.wxs deleted file mode 100644 index 9b7437e5..00000000 --- a/src/wixlib/NetFx4AsPrereq.wxs +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - $(var.NetFx40WebId) - $(var.NetFx40EulaLink) - - - - - - - - - - - - - $(var.NetFx40RedistId) - $(var.NetFx40EulaLink) - - - - - - - - - - - - - $(var.NetFx40ClientWebId) - $(var.NetFx40EulaLink) - - - - - - - - - - - - - $(var.NetFx40ClientRedistId) - $(var.NetFx40EulaLink) - - - - - - - - - - - - - diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 51268803..c33375fe 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -15,13 +15,6 @@ - - - - - - - -- cgit v1.2.3-55-g6feb From 05edba00dc08b74a6d9b32b4e56f4da6ef90c638 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 23 Apr 2020 12:11:30 +1000 Subject: Update BalBurnBackendExtension to use BundleFinalize. --- src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 28 ++++++++++++++++++++++ .../WixToolsetTest.Bal/TestData/MBA/Bundle.wxs | 10 ++++++++ .../TestData/WixStdBa/Bundle.wxs | 5 +--- .../WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 6 +++++ src/wixext/BalBurnBackendExtension.cs | 13 +++------- 5 files changed, 48 insertions(+), 14 deletions(-) create mode 100644 src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs (limited to 'src') diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index d93ed74a..97ac68a7 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -34,5 +34,33 @@ namespace WixToolsetTest.Bal Assert.True(File.Exists(bundleFile)); } } + + [Fact] + public void CantBuildUsingMBAWithNoPrereqs() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\MBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), + "-o", bundleFile, + }); + Assert.Equal(6802, compileResult.ExitCode); + Assert.Equal("There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString()); + + Assert.False(File.Exists(bundleFile)); + Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); + } + } } } diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs new file mode 100644 index 00000000..b3538c68 --- /dev/null +++ b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs index 3a37e8ec..45bb25d1 100644 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs @@ -6,10 +6,7 @@ - - - - + diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 84a38e56..19c86839 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -12,9 +12,14 @@ + + + + + @@ -25,6 +30,7 @@ + diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index e1082889..71cd2d92 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -9,21 +9,14 @@ namespace WixToolset.Bal using WixToolset.Data.Burn; using WixToolset.Data.Tuples; using WixToolset.Extensibility; - using WixToolset.Extensibility.Data; public class BalBurnBackendExtension : BaseBurnBackendExtension { - public override void PostBackendBind(IBindResult result) + public override void BundleFinalize() { - base.PostBackendBind(result); + base.BundleFinalize(); - if (result.Wixout == null) - { - this.Messaging.Write(new Message(null, MessageLevel.Warning, 1, "BurnBackend didn't provide Wixout so skipping BalExtension PostBind verification.")); - return; - } - - var intermediate = Intermediate.Load(result.Wixout); + var intermediate = this.Context.IntermediateRepresentation; var section = intermediate.Sections.Single(); var baTuple = section.Tuples.OfType().SingleOrDefault(); -- cgit v1.2.3-55-g6feb From bd3ee565f342bc0bb015594f303d13b67285a958 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 23 Apr 2020 12:17:32 +1000 Subject: Update ManagedHost tests to run off of a bundle. --- nuget.config | 1 + .../WixToolsetTest.ManagedHost/MbaHostFixture.cs | 74 ++++++++++++++++----- .../TestData/FullFramework2MBA/Bundle.wxs | 15 +++++ .../TestData/FullFramework4MBA/Bundle.wxs | 15 +++++ src/test/WixToolsetTest.ManagedHost/TestEngine.cs | 15 ++++- .../WixToolsetTest.ManagedHost.csproj | 12 ++++ .../BootstrapperApplicationData.xml | Bin 20128 -> 0 bytes .../Example.FullFramework2MBA.csproj | 21 ------ .../examples/FullFramework2MBA/FullFramework2BA.cs | 7 ++ .../BootstrapperApplicationData.xml | Bin 20128 -> 0 bytes .../Example.FullFramework4MBA.csproj | 26 +------- .../examples/FullFramework4MBA/FullFramework4BA.cs | 7 ++ src/test/examples/TestEngine/ExampleTestEngine.cpp | 8 +-- src/test/examples/TestEngine/ShutdownEngine.cpp | 8 ++- src/test/examples/TestEngine/TestEngine.cpp | 34 ++++++++-- src/test/examples/TestEngine/TestEngine.h | 6 ++ src/test/examples/TestEngine/precomp.h | 2 + .../WixStandardBootstrapperApplication.cpp | 5 ++ 18 files changed, 184 insertions(+), 72 deletions(-) create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs delete mode 100644 src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml delete mode 100644 src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml (limited to 'src') diff --git a/nuget.config b/nuget.config index 837b3770..84834350 100644 --- a/nuget.config +++ b/nuget.config @@ -11,6 +11,7 @@ + diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs index 8da42e77..8ef0320e 100644 --- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs @@ -2,7 +2,9 @@ namespace WixToolsetTest.ManagedHost { + using System.IO; using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; using Xunit; public class MbaHostFixture @@ -10,31 +12,71 @@ namespace WixToolsetTest.ManagedHost [Fact] public void CanLoadFullFramework2MBA() { - var testEngine = new TestEngine(); - var baFile = TestData.Get(@"..\examples\Example.FullFramework2MBA\mbahost.dll"); + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "FullFramework2MBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\FullFramework2MBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); - var result = testEngine.RunShutdownEngine(baFile); - Assert.Equal(0, result.ExitCode); + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); - var logMessages = result.Output; - Assert.Equal(2, logMessages.Count); - Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]); + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("FullFramework2BA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } } [Fact] public void CanLoadFullFramework4MBA() { - var testEngine = new TestEngine(); - var baFile = TestData.Get(@"..\examples\Example.FullFramework4MBA\net48\mbahost.dll"); + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "FullFramework4MBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\FullFramework4MBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); - var result = testEngine.RunShutdownEngine(baFile); - Assert.Equal(0, result.ExitCode); + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); - var logMessages = result.Output; - Assert.Equal(2, logMessages.Count); - Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[1]); + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("FullFramework4BA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } } } } diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs new file mode 100644 index 00000000..b38e9f6e --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs new file mode 100644 index 00000000..b3072e63 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs index 4dd531ad..751ed59c 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs +++ b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs @@ -4,15 +4,26 @@ namespace WixToolsetTest.ManagedHost { using System.Collections.Generic; using System.Diagnostics; + using System.IO; using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; public class TestEngine { private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); + public static readonly string BurnStubFile = TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"); - public TestEngineResult RunShutdownEngine(string baFile) + public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath) { - var args = new string[] { '"' + baFile + '"' }; + var baFolderPath = Path.Combine(tempFolderPath, "ba"); + var extractFolderPath = Path.Combine(tempFolderPath, "extract"); + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFilePath, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var args = new string[] { + '"' + bundleFilePath + '"', + '"' + extractResult.GetBAFilePath(baFolderPath) + '"', + }; return RunProcessCaptureOutput(TestEngineFile, args); } diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 02b0b109..5026af85 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -12,15 +12,27 @@ + + + + + + + + + + + + diff --git a/src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml b/src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml deleted file mode 100644 index 7c4169b1..00000000 Binary files a/src/test/examples/FullFramework2MBA/BootstrapperApplicationData.xml and /dev/null differ diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj index 494d1987..644bab44 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -28,7 +28,6 @@ - @@ -43,22 +42,6 @@ ..\..\..\..\packages\WixToolset.Mba.Core.4.0.18\lib\net20\WixToolset.Mba.Core.dll - - - {12c87c77-3547-44f8-8134-29bc915cb19d} - false - - - {F2BA1935-70FA-4156-B161-FD03850B4FAA} - false - Content - PreserveNewest - - - - - - @@ -70,8 +53,4 @@ - - - - \ No newline at end of file diff --git a/src/test/examples/FullFramework2MBA/FullFramework2BA.cs b/src/test/examples/FullFramework2MBA/FullFramework2BA.cs index 13d4673a..32cd19c8 100644 --- a/src/test/examples/FullFramework2MBA/FullFramework2BA.cs +++ b/src/test/examples/FullFramework2MBA/FullFramework2BA.cs @@ -16,6 +16,13 @@ namespace Example.FullFramework2MBA { } + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(FullFramework2BA)); + } + protected override void OnShutdown(ShutdownEventArgs args) { base.OnShutdown(args); diff --git a/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml b/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml deleted file mode 100644 index 7c4169b1..00000000 Binary files a/src/test/examples/FullFramework4MBA/BootstrapperApplicationData.xml and /dev/null differ diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj index 40f6d008..2d0dd790 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -1,5 +1,7 @@ - + + + net48 Full Framework v4 MBA @@ -11,28 +13,6 @@ - - - - - {12c87c77-3547-44f8-8134-29bc915cb19d} - false - - - {F2BA1935-70FA-4156-B161-FD03850B4FAA} - false - Content - PreserveNewest - - - - - - - - - - \ No newline at end of file diff --git a/src/test/examples/FullFramework4MBA/FullFramework4BA.cs b/src/test/examples/FullFramework4MBA/FullFramework4BA.cs index 556a61a7..8ee3bd19 100644 --- a/src/test/examples/FullFramework4MBA/FullFramework4BA.cs +++ b/src/test/examples/FullFramework4MBA/FullFramework4BA.cs @@ -16,6 +16,13 @@ namespace Example.FullFramework4MBA { } + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(FullFramework4BA)); + } + protected override void OnShutdown(ShutdownEventArgs args) { base.OnShutdown(args); diff --git a/src/test/examples/TestEngine/ExampleTestEngine.cpp b/src/test/examples/TestEngine/ExampleTestEngine.cpp index 9f051875..848b385c 100644 --- a/src/test/examples/TestEngine/ExampleTestEngine.cpp +++ b/src/test/examples/TestEngine/ExampleTestEngine.cpp @@ -8,15 +8,15 @@ int __cdecl wmain(int argc, LPWSTR argv[]) ConsoleInitialize(); - if (argc != 2) + if (argc != 3) { - ConsoleWriteError(hr, CONSOLE_COLOR_RED, "Usage: Example.TestEngine.exe BA.dll"); + ConsoleWriteError(hr, CONSOLE_COLOR_RED, "Usage: Example.TestEngine.exe Bundle.exe BA.dll"); } else { - hr = RunShutdownEngine(argv[1]); + hr = RunShutdownEngine(argv[1], argv[2]); } ConsoleUninitialize(); - return HRESULT_CODE(hr); + return hr; } diff --git a/src/test/examples/TestEngine/ShutdownEngine.cpp b/src/test/examples/TestEngine/ShutdownEngine.cpp index 69321d91..912d36ba 100644 --- a/src/test/examples/TestEngine/ShutdownEngine.cpp +++ b/src/test/examples/TestEngine/ShutdownEngine.cpp @@ -3,6 +3,7 @@ #include "precomp.h" HRESULT RunShutdownEngine( + __in LPCWSTR wzBundleFilePath, __in LPCWSTR wzBAFilePath ) { @@ -12,12 +13,17 @@ HRESULT RunShutdownEngine( pTestEngine = new TestEngine(); ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); - hr = pTestEngine->LoadBA(wzBAFilePath); + hr = pTestEngine->LoadBA(wzBundleFilePath, wzBAFilePath); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); + hr = pTestEngine->SendStartupEvent(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); + pTestEngine->UnloadBA(); + LExit: return hr; } diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp index c0a62eda..9d8f8638 100644 --- a/src/test/examples/TestEngine/TestEngine.cpp +++ b/src/test/examples/TestEngine/TestEngine.cpp @@ -3,13 +3,13 @@ #include "precomp.h" HRESULT TestEngine::LoadBA( + __in LPCWSTR wzBundleFilePath, __in LPCWSTR wzBAFilePath ) { HRESULT hr = S_OK; BOOTSTRAPPER_COMMAND command = { }; BOOTSTRAPPER_CREATE_ARGS args = { }; - HMODULE hBAModule = NULL; PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL; if (m_pCreateResults) @@ -19,7 +19,7 @@ HRESULT TestEngine::LoadBA( LogInitialize(::GetModuleHandleW(NULL)); - hr = LogOpen(NULL, L"ExampleTestEngine", NULL, L"txt", FALSE, FALSE, NULL); + hr = LogOpen(NULL, PathFile(wzBundleFilePath), NULL, L"txt", FALSE, FALSE, NULL); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to open log."); m_pCreateResults = static_cast(MemAlloc(sizeof(BOOTSTRAPPER_CREATE_RESULTS), TRUE)); @@ -34,10 +34,10 @@ HRESULT TestEngine::LoadBA( m_pCreateResults->cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); - hBAModule = ::LoadLibraryExW(wzBAFilePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - ExitOnNullWithLastError(hBAModule, hr, "Failed to load BA dll."); + m_hBAModule = ::LoadLibraryExW(wzBAFilePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + ExitOnNullWithLastError(m_hBAModule, hr, "Failed to load BA dll."); - pfnCreate = (PFN_BOOTSTRAPPER_APPLICATION_CREATE)::GetProcAddress(hBAModule, "BootstrapperApplicationCreate"); + pfnCreate = (PFN_BOOTSTRAPPER_APPLICATION_CREATE)::GetProcAddress(m_hBAModule, "BootstrapperApplicationCreate"); ConsoleExitOnNull(pfnCreate, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to get address for BootstrapperApplicationCreate."); hr = pfnCreate(&args, m_pCreateResults); @@ -68,6 +68,29 @@ HRESULT TestEngine::SendShutdownEvent( return hr; } +HRESULT TestEngine::SendStartupEvent() +{ + HRESULT hr = S_OK; + BA_ONSTARTUP_ARGS startupArgs = { }; + BA_ONSTARTUP_RESULTS startupResults = { }; + startupArgs.cbSize = sizeof(BA_ONSTARTUP_ARGS); + startupResults.cbSize = sizeof(BA_ONSTARTUP_RESULTS); + hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP, &startupArgs, &startupResults, m_pCreateResults->pvBootstrapperApplicationProcContext); + return hr; +} + +void TestEngine::UnloadBA() +{ + PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = NULL; + + pfnDestroy = (PFN_BOOTSTRAPPER_APPLICATION_DESTROY)::GetProcAddress(m_hBAModule, "BootstrapperApplicationDestroy"); + + if (pfnDestroy) + { + pfnDestroy(); + } +} + HRESULT TestEngine::BAEngineLog( __in TestEngine* pContext, __in BAENGINE_LOG_ARGS* pArgs, @@ -108,6 +131,7 @@ LExit: TestEngine::TestEngine() { + m_hBAModule = NULL; m_pCreateResults = NULL; } diff --git a/src/test/examples/TestEngine/TestEngine.h b/src/test/examples/TestEngine/TestEngine.h index 52872100..e5db9480 100644 --- a/src/test/examples/TestEngine/TestEngine.h +++ b/src/test/examples/TestEngine/TestEngine.h @@ -7,6 +7,7 @@ class TestEngine { public: HRESULT LoadBA( + __in LPCWSTR wzBundleFilePath, __in LPCWSTR wzBAFilePath ); @@ -18,6 +19,10 @@ public: __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction ); + HRESULT SendStartupEvent(); + + void UnloadBA(); + private: static HRESULT BAEngineLog( __in TestEngine* pContext, @@ -38,5 +43,6 @@ public: ~TestEngine(); private: + HMODULE m_hBAModule; BOOTSTRAPPER_CREATE_RESULTS* m_pCreateResults; }; \ No newline at end of file diff --git a/src/test/examples/TestEngine/precomp.h b/src/test/examples/TestEngine/precomp.h index 6e867e89..d0068747 100644 --- a/src/test/examples/TestEngine/precomp.h +++ b/src/test/examples/TestEngine/precomp.h @@ -8,6 +8,7 @@ #include "conutil.h" #include "logutil.h" #include "memutil.h" +#include "pathutil.h" #include "BootstrapperEngine.h" #include "BootstrapperApplication.h" @@ -15,5 +16,6 @@ #include "TestEngine.h" HRESULT RunShutdownEngine( + __in LPCWSTR wzBundleFilePath, __in LPCWSTR wzBAFilePath ); diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 4aef8ce5..88a26534 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -3752,6 +3752,11 @@ HRESULT CreateBootstrapperApplication( HRESULT hr = S_OK; CWixStandardBootstrapperApplication* pApplication = NULL; + if (BOOTSTRAPPER_DISPLAY_UNKNOWN == pArgs->pCommand->display) + { + ExitOnFailure(hr = E_INVALIDARG, "Engine requested Unknown display type."); + } + pApplication = new CWixStandardBootstrapperApplication(hModule, fPrereq, hrHostInitialization, pEngine, pArgs); ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new standard bootstrapper application object."); -- cgit v1.2.3-55-g6feb From ab495395492055c8c016e54ab0b1f7af2e9f164c Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 23 Apr 2020 12:26:07 +1000 Subject: Add reload engine and test. --- .../WixToolsetTest.ManagedHost/MbaHostFixture.cs | 78 ++++++++++++++++++++++ src/test/WixToolsetTest.ManagedHost/TestEngine.cs | 11 +++ .../FullFramework2MBA/FullFramework2BAFactory.cs | 7 ++ .../FullFramework4MBA/FullFramework4BAFactory.cs | 7 ++ .../examples/TestEngine/Example.TestEngine.vcxproj | 3 + src/test/examples/TestEngine/ExampleTestEngine.cpp | 20 +++++- src/test/examples/TestEngine/ReloadEngine.cpp | 43 ++++++++++++ src/test/examples/TestEngine/ReloadEngine.h | 8 +++ src/test/examples/TestEngine/ShutdownEngine.cpp | 5 +- src/test/examples/TestEngine/ShutdownEngine.h | 8 +++ src/test/examples/TestEngine/TestEngine.cpp | 32 +++++++-- src/test/examples/TestEngine/TestEngine.h | 6 +- src/test/examples/TestEngine/precomp.h | 7 +- 13 files changed, 217 insertions(+), 18 deletions(-) create mode 100644 src/test/examples/TestEngine/ReloadEngine.cpp create mode 100644 src/test/examples/TestEngine/ReloadEngine.h create mode 100644 src/test/examples/TestEngine/ShutdownEngine.h (limited to 'src') diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs index 8ef0320e..8b0a3691 100644 --- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs @@ -78,5 +78,83 @@ namespace WixToolsetTest.ManagedHost Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); } } + + [Fact] + public void CanReloadFullFramework2MBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "FullFramework2MBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\FullFramework2MBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("FullFramework2BA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading managed bootstrapper application.", logMessages[4]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]); + Assert.Equal("FullFramework2BA", logMessages[6]); + Assert.Equal("Shutdown,Restart,0", logMessages[7]); + } + } + + [Fact] + public void CanReloadFullFramework4MBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "FullFramework4MBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\FullFramework4MBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("FullFramework4BA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading managed bootstrapper application.", logMessages[4]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]); + Assert.Equal("FullFramework4BA", logMessages[6]); + Assert.Equal("Shutdown,Restart,0", logMessages[7]); + } + } } } diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs index 751ed59c..cda32895 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs +++ b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs @@ -13,7 +13,17 @@ namespace WixToolsetTest.ManagedHost private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); public static readonly string BurnStubFile = TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"); + public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) + { + return this.RunTestEngine("reload", bundleFilePath, tempFolderPath); + } + public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath) + { + return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath); + } + + private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath) { var baFolderPath = Path.Combine(tempFolderPath, "ba"); var extractFolderPath = Path.Combine(tempFolderPath, "extract"); @@ -21,6 +31,7 @@ namespace WixToolsetTest.ManagedHost extractResult.AssertSuccess(); var args = new string[] { + engineMode, '"' + bundleFilePath + '"', '"' + extractResult.GetBAFilePath(baFolderPath) + '"', }; diff --git a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs index d3cafc70..40cff30f 100644 --- a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs +++ b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs @@ -6,8 +6,15 @@ namespace Example.FullFramework2MBA public class FullFramework2BAFactory : BaseBootstrapperApplicationFactory { + private static int loadCount = 0; + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; return new FullFramework2BA(engine); } } diff --git a/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs b/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs index b7c8750d..6a571a54 100644 --- a/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs +++ b/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs @@ -7,8 +7,15 @@ namespace Example.FullFramework4MBA public class FullFramework4BAFactory : BaseBootstrapperApplicationFactory { + private static int loadCount = 0; + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; return new FullFramework4BA(engine); } } diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index 554d54f6..56a536b4 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -46,12 +46,15 @@ Create + + + diff --git a/src/test/examples/TestEngine/ExampleTestEngine.cpp b/src/test/examples/TestEngine/ExampleTestEngine.cpp index 848b385c..a378c9a3 100644 --- a/src/test/examples/TestEngine/ExampleTestEngine.cpp +++ b/src/test/examples/TestEngine/ExampleTestEngine.cpp @@ -5,16 +5,30 @@ int __cdecl wmain(int argc, LPWSTR argv[]) { HRESULT hr = E_INVALIDARG; + BOOL fShowUsage = FALSE; ConsoleInitialize(); - if (argc != 3) + if (argc != 4) { - ConsoleWriteError(hr, CONSOLE_COLOR_RED, "Usage: Example.TestEngine.exe Bundle.exe BA.dll"); + fShowUsage = TRUE; + } + else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"reload", -1)) + { + hr = RunReloadEngine(argv[2], argv[3]); + } + else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"shutdown", -1)) + { + hr = RunShutdownEngine(argv[2], argv[3]); } else { - hr = RunShutdownEngine(argv[1], argv[2]); + fShowUsage = TRUE; + } + + if (fShowUsage) + { + ConsoleWriteError(hr, CONSOLE_COLOR_RED, "Usage: {reload|shutdown} Example.TestEngine.exe Bundle.exe BA.dll"); } ConsoleUninitialize(); diff --git a/src/test/examples/TestEngine/ReloadEngine.cpp b/src/test/examples/TestEngine/ReloadEngine.cpp new file mode 100644 index 00000000..83541672 --- /dev/null +++ b/src/test/examples/TestEngine/ReloadEngine.cpp @@ -0,0 +1,43 @@ +// 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. + +#include "precomp.h" + +HRESULT RunReloadEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ) +{ + HRESULT hr = S_OK; + TestEngine* pTestEngine = NULL; + + pTestEngine = new TestEngine(); + ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); + + hr = pTestEngine->Initialize(wzBundleFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine."); + + hr = pTestEngine->LoadBA(wzBAFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); + + hr = pTestEngine->SendStartupEvent(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); + + pTestEngine->UnloadBA(); + + hr = pTestEngine->LoadBA(wzBAFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); + + hr = pTestEngine->SendStartupEvent(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); + + pTestEngine->UnloadBA(); + +LExit: + return hr; +} diff --git a/src/test/examples/TestEngine/ReloadEngine.h b/src/test/examples/TestEngine/ReloadEngine.h new file mode 100644 index 00000000..0e8456af --- /dev/null +++ b/src/test/examples/TestEngine/ReloadEngine.h @@ -0,0 +1,8 @@ +#pragma once +// 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. + + +HRESULT RunReloadEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ); diff --git a/src/test/examples/TestEngine/ShutdownEngine.cpp b/src/test/examples/TestEngine/ShutdownEngine.cpp index 912d36ba..0dfbb429 100644 --- a/src/test/examples/TestEngine/ShutdownEngine.cpp +++ b/src/test/examples/TestEngine/ShutdownEngine.cpp @@ -13,7 +13,10 @@ HRESULT RunShutdownEngine( pTestEngine = new TestEngine(); ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); - hr = pTestEngine->LoadBA(wzBundleFilePath, wzBAFilePath); + hr = pTestEngine->Initialize(wzBundleFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine."); + + hr = pTestEngine->LoadBA(wzBAFilePath); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); hr = pTestEngine->SendStartupEvent(); diff --git a/src/test/examples/TestEngine/ShutdownEngine.h b/src/test/examples/TestEngine/ShutdownEngine.h new file mode 100644 index 00000000..0cfa147a --- /dev/null +++ b/src/test/examples/TestEngine/ShutdownEngine.h @@ -0,0 +1,8 @@ +#pragma once +// 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. + + +HRESULT RunShutdownEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ); diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp index 9d8f8638..203df115 100644 --- a/src/test/examples/TestEngine/TestEngine.cpp +++ b/src/test/examples/TestEngine/TestEngine.cpp @@ -2,8 +2,22 @@ #include "precomp.h" +HRESULT TestEngine::Initialize( + __in LPCWSTR wzBundleFilePath + ) +{ + HRESULT hr = S_OK; + + LogInitialize(::GetModuleHandleW(NULL)); + + hr = LogOpen(NULL, PathFile(wzBundleFilePath), NULL, L"txt", FALSE, FALSE, NULL); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to open log."); + +LExit: + return hr; +} + HRESULT TestEngine::LoadBA( - __in LPCWSTR wzBundleFilePath, __in LPCWSTR wzBAFilePath ) { @@ -12,16 +26,11 @@ HRESULT TestEngine::LoadBA( BOOTSTRAPPER_CREATE_ARGS args = { }; PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL; - if (m_pCreateResults) + if (m_pCreateResults || m_hBAModule) { ExitFunction1(hr = E_INVALIDSTATE); } - LogInitialize(::GetModuleHandleW(NULL)); - - hr = LogOpen(NULL, PathFile(wzBundleFilePath), NULL, L"txt", FALSE, FALSE, NULL); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to open log."); - m_pCreateResults = static_cast(MemAlloc(sizeof(BOOTSTRAPPER_CREATE_RESULTS), TRUE)); command.cbSize = sizeof(BOOTSTRAPPER_COMMAND); @@ -51,6 +60,7 @@ HRESULT TestEngine::Log( __in LPCWSTR wzMessage ) { + LogStringLine(REPORT_STANDARD, "%ls", wzMessage); return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage); } @@ -83,12 +93,20 @@ void TestEngine::UnloadBA() { PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = NULL; + ReleaseNullMem(m_pCreateResults); + pfnDestroy = (PFN_BOOTSTRAPPER_APPLICATION_DESTROY)::GetProcAddress(m_hBAModule, "BootstrapperApplicationDestroy"); if (pfnDestroy) { pfnDestroy(); } + + if (m_hBAModule) + { + ::FreeLibrary(m_hBAModule); + m_hBAModule = NULL; + } } HRESULT TestEngine::BAEngineLog( diff --git a/src/test/examples/TestEngine/TestEngine.h b/src/test/examples/TestEngine/TestEngine.h index e5db9480..cf1c8aac 100644 --- a/src/test/examples/TestEngine/TestEngine.h +++ b/src/test/examples/TestEngine/TestEngine.h @@ -1,13 +1,15 @@ #pragma once // 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. -#include "precomp.h" class TestEngine { public: + HRESULT Initialize( + __in LPCWSTR wzBundleFilePath + ); + HRESULT LoadBA( - __in LPCWSTR wzBundleFilePath, __in LPCWSTR wzBAFilePath ); diff --git a/src/test/examples/TestEngine/precomp.h b/src/test/examples/TestEngine/precomp.h index d0068747..0d2afb06 100644 --- a/src/test/examples/TestEngine/precomp.h +++ b/src/test/examples/TestEngine/precomp.h @@ -14,8 +14,5 @@ #include "BootstrapperApplication.h" #include "TestEngine.h" - -HRESULT RunShutdownEngine( - __in LPCWSTR wzBundleFilePath, - __in LPCWSTR wzBAFilePath - ); +#include "ReloadEngine.h" +#include "ShutdownEngine.h" -- cgit v1.2.3-55-g6feb From f4b14ff16f78435285bb20f16d5d62b902e6ba17 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 29 Apr 2020 19:26:19 +1000 Subject: Update dependencies. --- src/Samples/bafunctions/bafunctions.vcxproj | 8 ++++---- src/Samples/bafunctions/packages.config | 4 ++-- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 8 ++++---- src/mbahost/packages.config | 4 ++-- .../examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | 6 +++--- src/test/examples/FullFramework2MBA/packages.config | 2 +- .../examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 8 ++++---- src/test/examples/TestEngine/packages.config | 4 ++-- src/wixstdba/packages.config | 4 ++-- src/wixstdba/wixstdba.vcxproj | 8 ++++---- 13 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 89c7b553..9f2181f2 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -57,8 +57,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index bb4c9d19..23b191d4 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 5d08e607..4b257195 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -44,7 +44,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.18\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.19\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 0fa223c0..10ce3830 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index cdcea2a4..fbcc9094 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -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}. - - + + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index bb4c9d19..23b191d4 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,7 +1,7 @@  - - + + \ 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 644bab44..c946fcde 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.18\lib\net20\WixToolset.Mba.Core.dll + ..\..\..\..\packages\WixToolset.Mba.Core.4.0.19\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 59d81db0..4f9f88e6 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 2d0dd790..9be3cc4a 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/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index 56a536b4..be52105b 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -66,8 +66,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/packages.config b/src/test/examples/TestEngine/packages.config index bb4c9d19..23b191d4 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/wixstdba/packages.config b/src/wixstdba/packages.config index bb4c9d19..23b191d4 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 1c55d41a..ab15c62f 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -107,8 +107,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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}. - - + + -- cgit v1.2.3-55-g6feb From 39e930d9aaff250e0fd5019eeedaa40717a6c6fe Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 29 Apr 2020 19:28:50 +1000 Subject: Add DotNetCoreBootstrapperApplicationHost for an SCD-style .NET Core BA. --- Bal.wixext.sln | 56 ++++ src/Custom.Build.props | 8 +- .../BootstrapperApplicationFactory.cs | 87 +++++ .../DnchostAssemblyLoadContext.cs | 58 ++++ src/WixToolset.Dnc.Host/Exceptions.cs | 145 +++++++++ .../IBootstrapperApplicationFactory.cs | 16 + src/WixToolset.Dnc.Host/NativeMethods.cs | 18 ++ src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 38 +++ .../BootstrapperApplicationFactory.cs | 3 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 6 +- src/dnchost/coreclrhost.h | 137 ++++++++ src/dnchost/dnchost.cpp | 229 +++++++++++++ src/dnchost/dnchost.def | 6 + src/dnchost/dnchost.h | 19 ++ src/dnchost/dnchost.vcxproj | 77 +++++ src/dnchost/dncutil.cpp | 359 +++++++++++++++++++++ src/dnchost/dncutil.h | 36 +++ src/dnchost/hostfxr.h | 96 ++++++ src/dnchost/packages.config | 8 + src/dnchost/precomp.cpp | 3 + src/dnchost/precomp.h | 29 ++ .../WixToolsetTest.ManagedHost/DncHostFixture.cs | 232 +++++++++++++ .../HarvestDirectoryToPayloadGroup.ps1 | 42 +++ .../TestData/EarliestCoreMBA/HarvestedSCD.wxs | 235 ++++++++++++++ .../EarliestCoreMBA/HarvestedTrimmedSCD.wxs | 113 +++++++ .../EarliestCoreMBA/SelfContainedBundle.wxs | 12 + .../EarliestCoreMBA/TrimmedSelfContainedBundle.wxs | 12 + .../TestData/LatestCoreMBA/HarvestedSCD.wxs | 235 ++++++++++++++ .../TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs | 113 +++++++ .../TestData/LatestCoreMBA/SelfContainedBundle.wxs | 12 + .../LatestCoreMBA/TrimmedSelfContainedBundle.wxs | 12 + .../WixToolsetTest.ManagedHost.csproj | 30 ++ .../examples/EarliestCoreMBA/EarliestCoreBA.cs | 34 ++ .../EarliestCoreMBA/EarliestCoreBAFactory.cs | 22 ++ .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 18 ++ .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 23 ++ src/test/examples/LatestCoreMBA/LatestCoreBA.cs | 33 ++ .../examples/LatestCoreMBA/LatestCoreBAFactory.cs | 22 ++ src/test/examples/TestEngine/TestEngine.cpp | 16 +- src/test/examples/TestEngine/precomp.h | 1 + src/wixext/BalCompiler.cs | 9 + src/wixext/Tuples/BalTupleDefinitions.cs | 15 + src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs | 47 +++ src/wixext/bal.xsd | 17 +- src/wixlib/Dnc.wxs | 21 ++ src/wixlib/bal.wixproj | 5 + 46 files changed, 2756 insertions(+), 9 deletions(-) create mode 100644 src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs create mode 100644 src/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs create mode 100644 src/WixToolset.Dnc.Host/Exceptions.cs create mode 100644 src/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs create mode 100644 src/WixToolset.Dnc.Host/NativeMethods.cs create mode 100644 src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj create mode 100644 src/dnchost/coreclrhost.h create mode 100644 src/dnchost/dnchost.cpp create mode 100644 src/dnchost/dnchost.def create mode 100644 src/dnchost/dnchost.h create mode 100644 src/dnchost/dnchost.vcxproj create mode 100644 src/dnchost/dncutil.cpp create mode 100644 src/dnchost/dncutil.h create mode 100644 src/dnchost/hostfxr.h create mode 100644 src/dnchost/packages.config create mode 100644 src/dnchost/precomp.cpp create mode 100644 src/dnchost/precomp.h create mode 100644 src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs create mode 100644 src/test/WixToolsetTest.ManagedHost/HarvestDirectoryToPayloadGroup.ps1 create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs create mode 100644 src/test/examples/EarliestCoreMBA/EarliestCoreBA.cs create mode 100644 src/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs create mode 100644 src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj create mode 100644 src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj create mode 100644 src/test/examples/LatestCoreMBA/LatestCoreBA.cs create mode 100644 src/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs create mode 100644 src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs create mode 100644 src/wixlib/Dnc.wxs (limited to 'src') diff --git a/Bal.wixext.sln b/Bal.wixext.sln index 84c30661..b4b384af 100644 --- a/Bal.wixext.sln +++ b/Bal.wixext.sln @@ -13,6 +13,8 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixpr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dnc.Host", "src\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj", "{0D780900-C2FF-4FA2-8CB5-8A19768724C5}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}" @@ -27,6 +29,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.EarliestCoreMBA", "src\test\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj", "{1E86D8DF-DABD-4B6E-A812-64CD2040C73A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnchost", "src\dnchost\dnchost.vcxproj", "{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.LatestCoreMBA", "src\test\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj", "{A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -89,6 +97,18 @@ Global {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.Build.0 = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.ActiveCfg = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.Build.0 = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x64.ActiveCfg = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x64.Build.0 = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x86.ActiveCfg = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x86.Build.0 = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|Any CPU.Build.0 = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x64.ActiveCfg = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x64.Build.0 = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x86.ActiveCfg = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x86.Build.0 = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -161,6 +181,40 @@ Global {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.Build.0 = Release|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.ActiveCfg = Release|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.Build.0 = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.ActiveCfg = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.Build.0 = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.ActiveCfg = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.Build.0 = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.Build.0 = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.ActiveCfg = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.Build.0 = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.ActiveCfg = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.Build.0 = Release|Any CPU + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.Build.0 = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.ActiveCfg = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.ActiveCfg = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.Build.0 = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.ActiveCfg = Release|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.Build.0 = Release|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.ActiveCfg = Release|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.ActiveCfg = Release|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.Build.0 = Release|Win32 + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.ActiveCfg = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.Build.0 = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.ActiveCfg = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.Build.0 = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.Build.0 = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.ActiveCfg = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.Build.0 = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.ActiveCfg = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -169,6 +223,8 @@ Global {CC4236FC-226E-4232-AB50-24CBEC4D314D} = {C70E3534-A018-4D0A-A340-916C9777EEF7} {3D44B67D-A475-49BA-8310-E39F6C117CC9} = {C70E3534-A018-4D0A-A340-916C9777EEF7} {44297646-706D-4508-8E96-1B35B109694C} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618} = {C70E3534-A018-4D0A-A340-916C9777EEF7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {74046961-48BF-467A-A6C2-F886C75CE0BE} diff --git a/src/Custom.Build.props b/src/Custom.Build.props index f4352014..66e74d81 100644 --- a/src/Custom.Build.props +++ b/src/Custom.Build.props @@ -2,8 +2,10 @@ - - $(OutputPath)examples\$(ProjectName)\ - $(OutDir)examples\$(ProjectName)\ + + $(OutputPath)examples\$(ProjectName)\ + + + $(OutDir)examples\$(ProjectName)\ diff --git a/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs b/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs new file mode 100644 index 00000000..0c6ea367 --- /dev/null +++ b/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs @@ -0,0 +1,87 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Linq; + using System.Reflection; + using System.Runtime.InteropServices; + + /// + /// Entry point for the .NET Core host to create and return the BA to the engine. + /// Reflection is used instead of referencing WixToolset.Mba.Core directly to avoid requiring it in the AssemblyLoadContext. + /// + public sealed class BootstrapperApplicationFactory : IBootstrapperApplicationFactory + { + private string baFactoryAssemblyName; + private string baFactoryAssemblyPath; + + public BootstrapperApplicationFactory(string baFactoryAssemblyName, string baFactoryAssemblyPath) + { + this.baFactoryAssemblyName = baFactoryAssemblyName; + this.baFactoryAssemblyPath = baFactoryAssemblyPath; + } + + /// + /// Loads the bootstrapper application assembly and calls its IBootstrapperApplicationFactory.Create method. + /// + /// Pointer to BOOTSTRAPPER_CREATE_ARGS struct. + /// Pointer to BOOTSTRAPPER_CREATE_RESULTS struct. + /// The bootstrapper application assembly + /// does not define the . + public void Create(IntPtr pArgs, IntPtr pResults) + { + // Load the BA's IBootstrapperApplicationFactory. + var baFactoryType = BootstrapperApplicationFactory.GetBAFactoryTypeFromAssembly(this.baFactoryAssemblyName, this.baFactoryAssemblyPath); + var baFactory = Activator.CreateInstance(baFactoryType); + if (null == baFactory) + { + throw new InvalidBootstrapperApplicationFactoryException(); + } + + var createMethod = baFactoryType.GetMethod(nameof(Create), new[] { typeof(IntPtr), typeof(IntPtr) }); + if (null == createMethod) + { + throw new InvalidBootstrapperApplicationFactoryException(); + } + createMethod.Invoke(baFactory, new object[] { pArgs, pResults }); + } + + /// + /// Locates the and returns the specified type. + /// + /// The assembly that defines the IBootstrapperApplicationFactory implementation. + /// The bootstrapper application factory . + private static Type GetBAFactoryTypeFromAssembly(string assemblyName, string assemblyPath) + { + // The default ALC shouldn't need help loading the assembly, since the host should have provided the deps.json + // when starting the runtime. But it doesn't hurt so keep this in case an isolated ALC is ever needed. + var alc = new DnchostAssemblyLoadContext(assemblyPath, false); + var asm = alc.LoadFromAssemblyName(new AssemblyName(assemblyName)); + + var attr = asm.GetCustomAttributes() + .Where(a => a.GetType().FullName == "WixToolset.Mba.Core.BootstrapperApplicationFactoryAttribute") + .SingleOrDefault(); + + if (null == attr) + { + throw new MissingAttributeException(); + } + + var baFactoryTypeProperty = attr.GetType().GetProperty("BootstrapperApplicationFactoryType", typeof(Type)); + if (baFactoryTypeProperty == null || baFactoryTypeProperty.GetMethod == null) + { + throw new MissingAttributeException(); + } + + var baFactoryType = (Type)baFactoryTypeProperty.GetMethod.Invoke(attr, null); + return baFactoryType; + } + + // Entry point for the DNC host. + public static IBootstrapperApplicationFactory CreateBAFactory([MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyName, [MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyPath) + { + return new BootstrapperApplicationFactory(baFactoryAssemblyName, baFactoryAssemblyPath); + } + } +} diff --git a/src/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs b/src/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs new file mode 100644 index 00000000..1a383058 --- /dev/null +++ b/src/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs @@ -0,0 +1,58 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Reflection; + using System.Runtime.Loader; + + public sealed class DnchostAssemblyLoadContext : AssemblyLoadContext + { + private readonly AssemblyDependencyResolver resolver; + + public DnchostAssemblyLoadContext(string assemblyPath, bool isolateFromDefault) + : base(nameof(DnchostAssemblyLoadContext), isolateFromDefault) + { + this.resolver = new AssemblyDependencyResolver(assemblyPath); + + if (!this.IsCollectible) + { + AssemblyLoadContext.Default.Resolving += this.ResolveAssembly; + AssemblyLoadContext.Default.ResolvingUnmanagedDll += this.ResolveUnmanagedDll; + } + } + + private Assembly ResolveAssembly(AssemblyLoadContext defaultAlc, AssemblyName assemblyName) + { + var path = this.resolver.ResolveAssemblyToPath(assemblyName); + if (path != null) + { + var targetAlc = this.IsCollectible ? this : defaultAlc; + return targetAlc.LoadFromAssemblyPath(path); + } + + return null; + } + + private IntPtr ResolveUnmanagedDll(Assembly assembly, string unmanagedDllName) + { + var path = this.resolver.ResolveUnmanagedDllToPath(unmanagedDllName); + if (path != null) + { + return this.LoadUnmanagedDllFromPath(path); + } + + return IntPtr.Zero; + } + + protected override Assembly Load(AssemblyName assemblyName) + { + return this.ResolveAssembly(AssemblyLoadContext.Default, assemblyName); + } + + protected override IntPtr LoadUnmanagedDll(string unmanagedDllName) + { + return this.ResolveUnmanagedDll(null, unmanagedDllName); + } + } +} diff --git a/src/WixToolset.Dnc.Host/Exceptions.cs b/src/WixToolset.Dnc.Host/Exceptions.cs new file mode 100644 index 00000000..32d4d4c5 --- /dev/null +++ b/src/WixToolset.Dnc.Host/Exceptions.cs @@ -0,0 +1,145 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Runtime.Serialization; + + /// + /// Base class for exception returned to the bootstrapper application host. + /// + [Serializable] + public abstract class BootstrapperException : Exception + { + /// + /// Creates an instance of the base class with the given HRESULT. + /// + /// The HRESULT for the exception that is used by the bootstrapper application host. + public BootstrapperException(int hr) + { + this.HResult = hr; + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public BootstrapperException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public BootstrapperException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected BootstrapperException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } + + /// + /// The bootstrapper application assembly loaded by the host does not contain exactly one instance of the + /// class. + /// + /// + [Serializable] + public class MissingAttributeException : BootstrapperException + { + /// + /// Creates a new instance of the class. + /// + public MissingAttributeException() + : base(NativeMethods.E_NOTFOUND) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public MissingAttributeException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public MissingAttributeException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected MissingAttributeException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } + + /// + /// The bootstrapper application factory specified by the + /// does not extend the base class. + /// + /// + /// + [Serializable] + public class InvalidBootstrapperApplicationFactoryException : BootstrapperException + { + /// + /// Creates a new instance of the class. + /// + public InvalidBootstrapperApplicationFactoryException() + : base(NativeMethods.E_UNEXPECTED) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public InvalidBootstrapperApplicationFactoryException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public InvalidBootstrapperApplicationFactoryException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected InvalidBootstrapperApplicationFactoryException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } +} diff --git a/src/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs b/src/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs new file mode 100644 index 00000000..96731192 --- /dev/null +++ b/src/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs @@ -0,0 +1,16 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Runtime.InteropServices; + + [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface IBootstrapperApplicationFactory + { + void Create( + IntPtr pArgs, + IntPtr pResults + ); + } +} diff --git a/src/WixToolset.Dnc.Host/NativeMethods.cs b/src/WixToolset.Dnc.Host/NativeMethods.cs new file mode 100644 index 00000000..6dc393c6 --- /dev/null +++ b/src/WixToolset.Dnc.Host/NativeMethods.cs @@ -0,0 +1,18 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Runtime.InteropServices; + + /// + /// Contains native constants, functions, and structures for this assembly. + /// + internal static class NativeMethods + { + #region Error Constants + internal const int E_NOTFOUND = unchecked((int)0x80070490); + internal const int E_UNEXPECTED = unchecked((int)0x8000ffff); + #endregion + } +} diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj new file mode 100644 index 00000000..09580c2d --- /dev/null +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -0,0 +1,38 @@ + + + + + + netcoreapp3.0 + WixToolset.Dnc.Host + WiX Toolset .NET Core BA Host + WiX Toolset .NET Core BA Host + + + + + False + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs b/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs index 9385d1d1..78e68bd9 100644 --- a/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs +++ b/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs @@ -9,13 +9,14 @@ namespace WixToolset.Mba.Host using WixToolset.Mba.Core; /// - /// Entry point for the MBA host to create and return the BA to the engine. + /// Entry point for the managed host to create and return the BA to the engine. /// [ClassInterface(ClassInterfaceType.None)] public sealed class BootstrapperApplicationFactory : MarshalByRefObject, IBootstrapperApplicationFactory { /// /// Creates a new instance of the class. + /// Entry point for the MBA host. /// public BootstrapperApplicationFactory() { diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 4b257195..65467acc 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -60,9 +60,9 @@ - - - + + + diff --git a/src/dnchost/coreclrhost.h b/src/dnchost/coreclrhost.h new file mode 100644 index 00000000..07f28735 --- /dev/null +++ b/src/dnchost/coreclrhost.h @@ -0,0 +1,137 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + + + +// ***** ABOUT THIS HEADER ***** +// ************************************************************************************** +// +// This is the version on 2019-12-22 from +// https://github.com/dotnet/runtime/blob/master/src/coreclr/src/coreclr/hosts/inc/coreclrhost.h +// +// ************************************************************************************** +// **************************** + + +// +// APIs for hosting CoreCLR +// + +#ifndef __CORECLR_HOST_H__ +#define __CORECLR_HOST_H__ + +#if defined(_WIN32) && defined(_M_IX86) +#define CORECLR_CALLING_CONVENTION __stdcall +#else +#define CORECLR_CALLING_CONVENTION +#endif + +// For each hosting API, we define a function prototype and a function pointer +// The prototype is useful for implicit linking against the dynamic coreclr +// library and the pointer for explicit dynamic loading (dlopen, LoadLibrary) +#define CORECLR_HOSTING_API(function, ...) \ + extern "C" int CORECLR_CALLING_CONVENTION function(__VA_ARGS__); \ + typedef int (CORECLR_CALLING_CONVENTION *function##_ptr)(__VA_ARGS__) + +// +// Initialize the CoreCLR. Creates and starts CoreCLR host and creates an app domain +// +// Parameters: +// exePath - Absolute path of the executable that invoked the ExecuteAssembly (the native host application) +// appDomainFriendlyName - Friendly name of the app domain that will be created to execute the assembly +// propertyCount - Number of properties (elements of the following two arguments) +// propertyKeys - Keys of properties of the app domain +// propertyValues - Values of properties of the app domain +// hostHandle - Output parameter, handle of the created host +// domainId - Output parameter, id of the created app domain +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_initialize, + const char* exePath, + const char* appDomainFriendlyName, + int propertyCount, + const char** propertyKeys, + const char** propertyValues, + void** hostHandle, + unsigned int* domainId); + +// +// Shutdown CoreCLR. It unloads the app domain and stops the CoreCLR host. +// +// Parameters: +// hostHandle - Handle of the host +// domainId - Id of the domain +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_shutdown, + void* hostHandle, + unsigned int domainId); + +// +// Shutdown CoreCLR. It unloads the app domain and stops the CoreCLR host. +// +// Parameters: +// hostHandle - Handle of the host +// domainId - Id of the domain +// latchedExitCode - Latched exit code after domain unloaded +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_shutdown_2, + void* hostHandle, + unsigned int domainId, + int* latchedExitCode); + +// +// Create a native callable function pointer for a managed method. +// +// Parameters: +// hostHandle - Handle of the host +// domainId - Id of the domain +// entryPointAssemblyName - Name of the assembly which holds the custom entry point +// entryPointTypeName - Name of the type which holds the custom entry point +// entryPointMethodName - Name of the method which is the custom entry point +// delegate - Output parameter, the function stores a native callable function pointer to the delegate at the specified address +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_create_delegate, + void* hostHandle, + unsigned int domainId, + const char* entryPointAssemblyName, + const char* entryPointTypeName, + const char* entryPointMethodName, + void** delegate); + +// +// Execute a managed assembly with given arguments +// +// Parameters: +// hostHandle - Handle of the host +// domainId - Id of the domain +// argc - Number of arguments passed to the executed assembly +// argv - Array of arguments passed to the executed assembly +// managedAssemblyPath - Path of the managed assembly to execute (or NULL if using a custom entrypoint). +// exitCode - Exit code returned by the executed assembly +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_execute_assembly, + void* hostHandle, + unsigned int domainId, + int argc, + const char** argv, + const char* managedAssemblyPath, + unsigned int* exitCode); + +#undef CORECLR_HOSTING_API + +#endif // __CORECLR_HOST_H__ \ No newline at end of file diff --git a/src/dnchost/dnchost.cpp b/src/dnchost/dnchost.cpp new file mode 100644 index 00000000..c4b0d222 --- /dev/null +++ b/src/dnchost/dnchost.cpp @@ -0,0 +1,229 @@ +// 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. + +#include "precomp.h" + +static DNCSTATE vstate = { }; + + +// internal function declarations + +static HRESULT LoadModulePaths( + __in DNCSTATE* pState + ); +static HRESULT LoadDncConfiguration( + __in DNCSTATE* pState, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs + ); +static HRESULT LoadRuntime( + __in DNCSTATE* pState + ); +static HRESULT LoadManagedBootstrapperApplicationFactory( + __in DNCSTATE* pState + ); + + +// function definitions + +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID /* pvReserved */ + ) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + ::DisableThreadLibraryCalls(hInstance); + vstate.hInstance = hInstance; + break; + + case DLL_PROCESS_DETACH: + vstate.hInstance = NULL; + break; + } + + return TRUE; +} + +extern "C" HRESULT WINAPI BootstrapperApplicationCreate( + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + IBootstrapperEngine* pEngine = NULL; + + // coreclr.dll doesn't support unloading, so the rest of the .NET Core hosting stack doesn't support it either. + // This means we also can't unload. + pResults->fDisableUnloading = TRUE; + + hr = BalInitializeFromCreateArgs(pArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize Bal."); + + if (!vstate.fInitialized) + { + hr = XmlInitialize(); + BalExitOnFailure(hr, "Failed to initialize XML."); + + hr = LoadModulePaths(&vstate); + BalExitOnFailure(hr, "Failed to get the host base path."); + + hr = LoadDncConfiguration(&vstate, pArgs); + BalExitOnFailure(hr, "Failed to get the dnc configuration."); + + vstate.fInitialized = TRUE; + } + + if (!vstate.fInitializedRuntime) + { + hr = LoadRuntime(&vstate); + BalExitOnFailure(hr, "Failed to load .NET Core runtime."); + + vstate.fInitializedRuntime = TRUE; + + hr = LoadManagedBootstrapperApplicationFactory(&vstate); + BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application factory."); + } + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading .NET Core SCD bootstrapper application."); + + hr = vstate.pAppFactory->Create(pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application."); + +LExit: + ReleaseNullObject(pEngine); + + return hr; +} + +extern "C" void WINAPI BootstrapperApplicationDestroy() +{ + BalUninitialize(); +} + +static HRESULT LoadModulePaths( + __in DNCSTATE* pState + ) +{ + HRESULT hr = S_OK; + + hr = PathForCurrentProcess(&pState->sczModuleFullPath, pState->hInstance); + BalExitOnFailure(hr, "Failed to get the full host path."); + + hr = PathGetDirectory(pState->sczModuleFullPath, &pState->sczAppBase); + BalExitOnFailure(hr, "Failed to get the directory of the full process path."); + + hr = PathConcat(pState->sczAppBase, DNC_ASSEMBLY_FILE_NAME, &pState->sczManagedHostPath); + BalExitOnFailure(hr, "Failed to create managed host path."); + +LExit: + return hr; +} + +static HRESULT LoadDncConfiguration( + __in DNCSTATE* pState, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs + ) +{ + HRESULT hr = S_OK; + IXMLDOMDocument* pixdManifest = NULL; + IXMLDOMNode* pixnHost = NULL; + IXMLDOMNode* pixnPayload = NULL; + LPWSTR sczPayloadId = NULL; + LPWSTR sczPayloadXPath = NULL; + LPWSTR sczPayloadName = NULL; + + hr = XmlLoadDocumentFromFile(pArgs->pCommand->wzBootstrapperApplicationDataPath, &pixdManifest); + BalExitOnFailure(hr, "Failed to load BalManifest '%ls'", pArgs->pCommand->wzBootstrapperApplicationDataPath); + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBalBAFactoryAssembly", &pixnHost); + BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly element."); + + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config."); + } + + hr = XmlGetAttributeEx(pixnHost, L"PayloadId", &sczPayloadId); + BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@PayloadId."); + + hr = StrAllocFormatted(&sczPayloadXPath, L"/BootstrapperApplicationData/WixPayloadProperties[@Payload='%ls']", sczPayloadId); + BalExitOnFailure(hr, "Failed to format BAFactoryAssembly payload XPath."); + + hr = XmlSelectSingleNode(pixdManifest, sczPayloadXPath, &pixnPayload); + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + } + BalExitOnFailure(hr, "Failed to find WixPayloadProperties node for BAFactoryAssembly PayloadId: %ls.", sczPayloadId); + + hr = XmlGetAttributeEx(pixnPayload, L"Name", &sczPayloadName); + BalExitOnFailure(hr, "Failed to get BAFactoryAssembly payload Name."); + + hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath); + BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath."); + + LPCWSTR wzFileName = PathFile(pState->sczBaFactoryAssemblyPath); + LPCWSTR wzExtension = PathExtension(pState->sczBaFactoryAssemblyPath); + if (!wzExtension) + { + BalExitOnFailure(hr = E_FAIL, "BaFactoryAssemblyPath has no extension."); + } + + hr = StrAllocString(&pState->sczBaFactoryAssemblyName, wzFileName, wzExtension - wzFileName); + BalExitOnFailure(hr, "Failed to copy BAFactoryAssembly payload Name."); + + hr = StrAllocString(&pState->sczBaFactoryDepsJsonPath, pState->sczBaFactoryAssemblyPath, wzExtension - pState->sczBaFactoryAssemblyPath); + BalExitOnFailure(hr, "Failed to initialize deps json path."); + + hr = StrAllocString(&pState->sczBaFactoryRuntimeConfigPath, pState->sczBaFactoryDepsJsonPath, 0); + BalExitOnFailure(hr, "Failed to initialize runtime config path."); + + hr = StrAllocConcat(&pState->sczBaFactoryDepsJsonPath, L".deps.json", 0); + BalExitOnFailure(hr, "Failed to concat extension to deps json path."); + + hr = StrAllocConcat(&pState->sczBaFactoryRuntimeConfigPath, L".runtimeconfig.json", 0); + BalExitOnFailure(hr, "Failed to concat extension to runtime config path."); + +LExit: + ReleaseStr(sczPayloadName); + ReleaseObject(pixnPayload); + ReleaseStr(sczPayloadXPath); + ReleaseStr(sczPayloadId); + ReleaseObject(pixnHost); + ReleaseObject(pixdManifest); + + return hr; +} + +static HRESULT LoadRuntime( + __in DNCSTATE* pState + ) +{ + HRESULT hr = S_OK; + + hr = DnchostLoadRuntime( + &pState->hostfxrState, + pState->sczModuleFullPath, + pState->sczManagedHostPath, + pState->sczBaFactoryDepsJsonPath, + pState->sczBaFactoryRuntimeConfigPath); + + return hr; +} + +static HRESULT LoadManagedBootstrapperApplicationFactory( + __in DNCSTATE* pState + ) +{ + HRESULT hr = S_OK; + + hr = DnchostCreateFactory( + &pState->hostfxrState, + pState->sczBaFactoryAssemblyName, + pState->sczBaFactoryAssemblyPath, + &pState->pAppFactory); + + return hr; +} diff --git a/src/dnchost/dnchost.def b/src/dnchost/dnchost.def new file mode 100644 index 00000000..4488df94 --- /dev/null +++ b/src/dnchost/dnchost.def @@ -0,0 +1,6 @@ +; 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. + + +EXPORTS + BootstrapperApplicationCreate + BootstrapperApplicationDestroy diff --git a/src/dnchost/dnchost.h b/src/dnchost/dnchost.h new file mode 100644 index 00000000..e498edaf --- /dev/null +++ b/src/dnchost/dnchost.h @@ -0,0 +1,19 @@ +#pragma once +// 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. + + +struct DNCSTATE +{ + BOOL fInitialized; + BOOL fInitializedRuntime; + HINSTANCE hInstance; + LPWSTR sczModuleFullPath; + LPWSTR sczAppBase; + LPWSTR sczManagedHostPath; + LPWSTR sczBaFactoryAssemblyName; + LPWSTR sczBaFactoryAssemblyPath; + LPWSTR sczBaFactoryDepsJsonPath; + LPWSTR sczBaFactoryRuntimeConfigPath; + HOSTFXR_STATE hostfxrState; + IBootstrapperApplicationFactory* pAppFactory; +}; diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj new file mode 100644 index 00000000..e2b8b529 --- /dev/null +++ b/src/dnchost/dnchost.vcxproj @@ -0,0 +1,77 @@ + + + + + + + + + Debug + Win32 + + + Release + Win32 + + + + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} + DynamicLibrary + v141 + Unicode + dnchost + dnchost.def + + + + + ..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.3.1.3\runtimes\win-x86\native\ + shlwapi.lib;$(NetHostPath)nethost.lib + + + + + + Create + + + + + + + + + + + + + + + + PreserveNewest + False + + + + + $(BaseOutputPath)obj;$(NetHostPath);%(AdditionalIncludeDirectories) + + + + + {0D780900-C2FF-4FA2-8CB5-8A19768724C5} + true + + + + + + + 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/dnchost/dncutil.cpp b/src/dnchost/dncutil.cpp new file mode 100644 index 00000000..996bf086 --- /dev/null +++ b/src/dnchost/dncutil.cpp @@ -0,0 +1,359 @@ +// 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. + +#include "precomp.h" + +// https://github.com/dotnet/runtime/blob/master/src/installer/corehost/error_codes.h +#define HostApiBufferTooSmall 0x80008098 + +// internal function declarations + +static HRESULT GetHostfxrPath( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ); +static HRESULT LoadHostfxr( + __in HOSTFXR_STATE* pState + ); +static HRESULT InitializeHostfxr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzManagedHostPath, + __in LPCWSTR wzDepsJsonPath, + __in LPCWSTR wzRuntimeConfigPath + ); +static HRESULT InitializeCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ); +static HRESULT LoadCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzCoreClrPath + ); +static HRESULT StartCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath, + __in size_t cProperties, + __in LPCWSTR* propertyKeys, + __in LPCWSTR* propertyValues + ); + + +// function definitions + +HRESULT DnchostLoadRuntime( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath, + __in LPCWSTR wzManagedHostPath, + __in LPCWSTR wzDepsJsonPath, + __in LPCWSTR wzRuntimeConfigPath + ) +{ + HRESULT hr = S_OK; + + hr = GetHostfxrPath(pState, wzNativeHostPath); + BalExitOnFailure(hr, "Failed to find hostfxr."); + + hr = LoadHostfxr(pState); + BalExitOnFailure(hr, "Failed to load hostfxr."); + + hr = InitializeHostfxr(pState, wzManagedHostPath, wzDepsJsonPath, wzRuntimeConfigPath); + BalExitOnFailure(hr, "Failed to initialize hostfxr."); + + hr = InitializeCoreClr(pState, wzNativeHostPath); + BalExitOnFailure(hr, "Failed to initialize coreclr."); + +LExit: + return hr; +} + +HRESULT DnchostCreateFactory( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzBaFactoryAssemblyName, + __in LPCWSTR wzBaFactoryAssemblyPath, + __out IBootstrapperApplicationFactory** ppAppFactory + ) +{ + HRESULT hr = S_OK; + PFNCREATEBAFACTORY pfnCreateBAFactory = NULL; + + hr = pState->pfnCoreclrCreateDelegate( + pState->pClrHandle, + pState->dwDomainId, + DNC_ASSEMBLY_FULL_NAME, + DNC_ENTRY_TYPE, + DNC_STATIC_ENTRY_METHOD, + reinterpret_cast(&pfnCreateBAFactory)); + BalExitOnFailure(hr, "Failed to create delegate in app domain."); + + *ppAppFactory = pfnCreateBAFactory(wzBaFactoryAssemblyName, wzBaFactoryAssemblyPath); + +LExit: + return hr; +} + +static HRESULT GetHostfxrPath( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ) +{ + HRESULT hr = S_OK; + get_hostfxr_parameters getHostfxrParameters = { }; + int nrc = 0; + size_t cchHostFxrPath = MAX_PATH; + + getHostfxrParameters.size = sizeof(get_hostfxr_parameters); + getHostfxrParameters.assembly_path = wzNativeHostPath; + + // get_hostfxr_path does a full search on every call, so + // minimize the number of calls + // need to loop + for (;;) + { + cchHostFxrPath *= 2; + hr = StrAlloc(&pState->sczHostfxrPath, cchHostFxrPath); + BalExitOnFailure(hr, "Failed to allocate hostFxrPath."); + + nrc = get_hostfxr_path(pState->sczHostfxrPath, &cchHostFxrPath, &getHostfxrParameters); + if (HostApiBufferTooSmall != nrc) + { + break; + } + } + if (0 != nrc) + { + BalExitOnFailure(hr = nrc, "GetHostfxrPath failed"); + } + +LExit: + return hr; +} + +static HRESULT LoadHostfxr( + __in HOSTFXR_STATE* pState + ) +{ + HRESULT hr = S_OK; + HMODULE hHostfxr; + + hHostfxr = ::LoadLibraryExW(pState->sczHostfxrPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + BalExitOnNullWithLastError(hHostfxr, hr, "Failed to load hostfxr from '%ls'.", pState->sczHostfxrPath); + + pState->pfnHostfxrInitializeForApp = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_initialize_for_dotnet_command_line")); + BalExitOnNullWithLastError(pState->pfnHostfxrInitializeForApp, hr, "Failed to get procedure address for hostfxr_initialize_for_dotnet_command_line."); + + pState->pfnHostfxrGetRuntimeProperties = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_get_runtime_properties")); + BalExitOnNullWithLastError(pState->pfnHostfxrGetRuntimeProperties, hr, "Failed to get procedure address for hostfxr_get_runtime_properties."); + + pState->pfnHostfxrSetErrorWriter = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_set_error_writer")); + BalExitOnNullWithLastError(pState->pfnHostfxrSetErrorWriter, hr, "Failed to get procedure address for hostfxr_set_error_writer."); + + pState->pfnHostfxrClose = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_close")); + BalExitOnNullWithLastError(pState->pfnHostfxrClose, hr, "Failed to get procedure address for hostfxr_close."); + +LExit: + // Never unload the module since it isn't meant to be unloaded. + + return hr; +} + +static void HOSTFXR_CALLTYPE DnchostErrorWriter( + __in LPCWSTR wzMessage + ) +{ + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "error from hostfxr: %ls", wzMessage); +} + +static HRESULT InitializeHostfxr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzManagedHostPath, + __in LPCWSTR wzDepsJsonPath, + __in LPCWSTR wzRuntimeConfigPath + ) +{ + HRESULT hr = S_OK; + + pState->pfnHostfxrSetErrorWriter(static_cast(&DnchostErrorWriter)); + + LPCWSTR argv[] = { + L"exec", + L"--depsfile", + wzDepsJsonPath, + L"--runtimeconfig", + wzRuntimeConfigPath, + wzManagedHostPath, + }; + hr = pState->pfnHostfxrInitializeForApp(sizeof(argv)/sizeof(LPWSTR), argv, NULL, &pState->hostContextHandle); + BalExitOnFailure(hr, "HostfxrInitializeForApp failed"); + +LExit: + return hr; +} + +static HRESULT InitializeCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ) +{ + HRESULT hr = S_OK; + int32_t rc = 0; + LPCWSTR* rgPropertyKeys = NULL; + LPCWSTR* rgPropertyValues = NULL; + size_t cProperties = 0; + LPWSTR* rgDirectories = NULL; + UINT cDirectories = 0; + LPWSTR sczCoreClrPath = NULL; + + // We are not using hostfxr as it was intended to be used. We need to initialize hostfxr so that it properly initializes hostpolicy - + // there are pieces of the framework such as AssemblyDependencyResolver that won't work without that. We also need hostfxr to find a + // compatible framework for framework-dependent deployed BAs. We had to use hostfxr_initialize_for_dotnet_command_line since + // hostfxr_initialize_for_runtime_config doesn't currently (3.x) support self-contained deployed BAs. That means we're supposed to + // start the runtime through hostfxr_run_app, but that method shuts down the runtime before returning. We actually want to call + // hostfxr_get_runtime_delegate, but that method currently requires hostfxr to be initialized through + // hostfxr_initialize_for_runtime_config. So we're forced to locate coreclr.dll and manually load the runtime ourselves. + + // Unfortunately, that's not the only problem. hostfxr has global state that tracks whether it started the runtime. While we keep our + // hostfxr_handle open, everyone that calls the hostfxr_initialize_* methods will block until we have started the runtime through + // hostfxr or closed our handle. If we close the handle, then hostfxr could potentially try to load a second runtime into the + // process, which is not supported. We're going to just keep our handle open since no one else in the process should be trying to + // start the runtime anyway. + + rc = pState->pfnHostfxrGetRuntimeProperties(pState->hostContextHandle, &cProperties, rgPropertyKeys, rgPropertyValues); + if (HostApiBufferTooSmall != rc) + { + BalExitOnFailure(hr = rc, "HostfxrGetRuntimeProperties failed to return required size."); + } + + rgPropertyKeys = static_cast(MemAlloc(sizeof(LPWSTR) * cProperties, TRUE)); + rgPropertyValues = static_cast(MemAlloc(sizeof(LPWSTR) * cProperties, TRUE)); + if (!rgPropertyKeys || !rgPropertyValues) + { + BalExitOnFailure(hr = E_OUTOFMEMORY, "Failed to allocate buffers for runtime properties."); + } + + hr = pState->pfnHostfxrGetRuntimeProperties(pState->hostContextHandle, &cProperties, rgPropertyKeys, rgPropertyValues); + BalExitOnFailure(hr, "HostfxrGetRuntimeProperties failed."); + + for (DWORD i = 0; i < cProperties; ++i) + { + if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, 0, rgPropertyKeys[i], -1, L"NATIVE_DLL_SEARCH_DIRECTORIES", -1)) + { + hr = StrSplitAllocArray(&rgDirectories, &cDirectories, rgPropertyValues[i], L";"); + BalExitOnFailure(hr, "Failed to split NATIVE_DLL_SEARCH_DIRECTORIES '%ls'", rgPropertyValues[i]); + } + } + + for (DWORD i = 0; i < cDirectories; ++i) + { + hr = PathConcat(rgDirectories[i], L"coreclr.dll", &sczCoreClrPath); + BalExitOnFailure(hr, "Failed to allocate path to coreclr."); + + if (::PathFileExists(sczCoreClrPath)) + { + break; + } + else + { + ReleaseNullStr(sczCoreClrPath); + } + } + + if (!sczCoreClrPath) + { + for (DWORD i = 0; i < cProperties; ++i) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "%ls: %ls", rgPropertyKeys[i], rgPropertyValues[i]); + } + BalExitOnFailure(hr = E_FILENOTFOUND, "Failed to locate coreclr.dll."); + } + + hr = LoadCoreClr(pState, sczCoreClrPath); + BalExitOnFailure(hr, "Failed to load coreclr."); + + hr = StartCoreClr(pState, wzNativeHostPath, cProperties, rgPropertyKeys, rgPropertyValues); + BalExitOnFailure(hr, "Failed to start coreclr."); + +LExit: + MemFree(rgDirectories); + MemFree(rgPropertyValues); + MemFree(rgPropertyKeys); + ReleaseStr(sczCoreClrPath); + + return hr; +} + +static HRESULT LoadCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzCoreClrPath + ) +{ + HRESULT hr = S_OK; + HMODULE hModule = NULL; + + hModule = ::LoadLibraryExW(wzCoreClrPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + BalExitOnNullWithLastError(hModule, hr, "Failed to load coreclr.dll from '%ls'.", wzCoreClrPath); + + pState->pfnCoreclrInitialize = reinterpret_cast(::GetProcAddress(hModule, "coreclr_initialize")); + BalExitOnNullWithLastError(pState->pfnCoreclrInitialize, hr, "Failed to get procedure address for coreclr_initialize."); + + pState->pfnCoreclrCreateDelegate = reinterpret_cast(::GetProcAddress(hModule, "coreclr_create_delegate")); + BalExitOnNullWithLastError(pState->pfnCoreclrCreateDelegate, hr, "Failed to get procedure address for coreclr_create_delegate."); + +LExit: + // Never unload the module since coreclr doesn't support it. + + return hr; +} + +static HRESULT StartCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath, + __in size_t cProperties, + __in LPCWSTR* propertyKeys, + __in LPCWSTR* propertyValues + ) +{ + HRESULT hr = S_OK; + LPSTR szNativeHostPath = NULL; + LPSTR* rgPropertyKeys = NULL; + LPSTR* rgPropertyValues = NULL; + + rgPropertyKeys = static_cast(MemAlloc(sizeof(LPSTR) * cProperties, TRUE)); + rgPropertyValues = static_cast(MemAlloc(sizeof(LPSTR) * cProperties, TRUE)); + if (!rgPropertyKeys || !rgPropertyValues) + { + BalExitOnFailure(hr = E_OUTOFMEMORY, "Failed to allocate buffers for runtime properties."); + } + + hr = StrAnsiAllocString(&szNativeHostPath, wzNativeHostPath, 0, CP_UTF8); + BalExitOnFailure(hr, "Failed to convert module path to UTF8: %ls", wzNativeHostPath); + + for (DWORD i = 0; i < cProperties; ++i) + { + hr = StrAnsiAllocString(&rgPropertyKeys[i], propertyKeys[i], 0, CP_UTF8); + BalExitOnFailure(hr, "Failed to convert property key to UTF8: %ls", propertyKeys[i]); + + hr = StrAnsiAllocString(&rgPropertyValues[i], propertyValues[i], 0, CP_UTF8); + BalExitOnFailure(hr, "Failed to convert property value to UTF8: %ls", propertyValues[i]); + } + + hr = pState->pfnCoreclrInitialize(szNativeHostPath, "MBA", cProperties, (LPCSTR*)rgPropertyKeys, (LPCSTR*)rgPropertyValues, &pState->pClrHandle, &pState->dwDomainId); + BalExitOnFailure(hr, "CoreclrInitialize failed."); + +LExit: + for (DWORD i = 0; i < cProperties; ++i) + { + if (rgPropertyKeys) + { + ReleaseStr(rgPropertyKeys[i]); + } + + if (rgPropertyValues) + { + ReleaseStr(rgPropertyValues[i]); + } + } + ReleaseMem(rgPropertyValues); + ReleaseMem(rgPropertyKeys); + ReleaseStr(szNativeHostPath); + + return hr; +} diff --git a/src/dnchost/dncutil.h b/src/dnchost/dncutil.h new file mode 100644 index 00000000..1a7c16e3 --- /dev/null +++ b/src/dnchost/dncutil.h @@ -0,0 +1,36 @@ +#pragma once +// 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. + +typedef IBootstrapperApplicationFactory* (STDMETHODCALLTYPE* PFNCREATEBAFACTORY)( + __in LPCWSTR wzBaFactoryAssemblyName, + __in LPCWSTR wzBaFactoryAssemblyPath + ); + +struct HOSTFXR_STATE +{ + LPWSTR sczHostfxrPath; + hostfxr_handle hostContextHandle; + hostfxr_initialize_for_dotnet_command_line_fn pfnHostfxrInitializeForApp; + hostfxr_get_runtime_properties_fn pfnHostfxrGetRuntimeProperties; + hostfxr_set_error_writer_fn pfnHostfxrSetErrorWriter; + hostfxr_close_fn pfnHostfxrClose; + coreclr_initialize_ptr pfnCoreclrInitialize; + coreclr_create_delegate_ptr pfnCoreclrCreateDelegate; + void* pClrHandle; + UINT dwDomainId; +}; + +HRESULT DnchostLoadRuntime( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath, + __in LPCWSTR wzManagedHostPath, + __in LPCWSTR wzDepsJsonPath, + __in LPCWSTR wzRuntimeConfigPath + ); + +HRESULT DnchostCreateFactory( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzBaFactoryAssemblyName, + __in LPCWSTR wzBaFactoryAssemblyPath, + __out IBootstrapperApplicationFactory** ppAppFactory + ); diff --git a/src/dnchost/hostfxr.h b/src/dnchost/hostfxr.h new file mode 100644 index 00000000..85e6e0ab --- /dev/null +++ b/src/dnchost/hostfxr.h @@ -0,0 +1,96 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + + + +// ***** ABOUT THIS HEADER ***** +// ************************************************************************************** +// +// This is the version on 2019-12-22 from +// https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/hostfxr.h +// +// ************************************************************************************** +// **************************** + + +#ifndef __HOSTFXR_H__ +#define __HOSTFXR_H__ + +#include +#include + +#if defined(_WIN32) + #define HOSTFXR_CALLTYPE __cdecl + #ifdef _WCHAR_T_DEFINED + typedef wchar_t char_t; + #else + typedef unsigned short char_t; + #endif +#else + #define HOSTFXR_CALLTYPE + typedef char char_t; +#endif + +enum hostfxr_delegate_type +{ + hdt_com_activation, + hdt_load_in_memory_assembly, + hdt_winrt_activation, + hdt_com_register, + hdt_com_unregister, + hdt_load_assembly_and_get_function_pointer +}; + +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_main_fn)(const int argc, const char_t **argv); +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_main_startupinfo_fn)( + const int argc, + const char_t **argv, + const char_t *host_path, + const char_t *dotnet_root, + const char_t *app_path); + +typedef void(HOSTFXR_CALLTYPE *hostfxr_error_writer_fn)(const char_t *message); +typedef hostfxr_error_writer_fn(HOSTFXR_CALLTYPE *hostfxr_set_error_writer_fn)(hostfxr_error_writer_fn error_writer); + +typedef void* hostfxr_handle; +struct hostfxr_initialize_parameters +{ + size_t size; + const char_t *host_path; + const char_t *dotnet_root; +}; + +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_initialize_for_dotnet_command_line_fn)( + int argc, + const char_t **argv, + const struct hostfxr_initialize_parameters *parameters, + /*out*/ hostfxr_handle *host_context_handle); +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_initialize_for_runtime_config_fn)( + const char_t *runtime_config_path, + const struct hostfxr_initialize_parameters *parameters, + /*out*/ hostfxr_handle *host_context_handle); + +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_get_runtime_property_value_fn)( + const hostfxr_handle host_context_handle, + const char_t *name, + /*out*/ const char_t **value); +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_set_runtime_property_value_fn)( + const hostfxr_handle host_context_handle, + const char_t *name, + const char_t *value); +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_get_runtime_properties_fn)( + const hostfxr_handle host_context_handle, + /*inout*/ size_t * count, + /*out*/ const char_t **keys, + /*out*/ const char_t **values); + +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_run_app_fn)(const hostfxr_handle host_context_handle); +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_get_runtime_delegate_fn)( + const hostfxr_handle host_context_handle, + enum hostfxr_delegate_type type, + /*out*/ void **delegate); + +typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_close_fn)(const hostfxr_handle host_context_handle); + +#endif //__HOSTFXR_H__ \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config new file mode 100644 index 00000000..c8911ea5 --- /dev/null +++ b/src/dnchost/packages.config @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/dnchost/precomp.cpp b/src/dnchost/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/dnchost/precomp.cpp @@ -0,0 +1,3 @@ +// 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. + +#include "precomp.h" diff --git a/src/dnchost/precomp.h b/src/dnchost/precomp.h new file mode 100644 index 00000000..6a12ef67 --- /dev/null +++ b/src/dnchost/precomp.h @@ -0,0 +1,29 @@ +#pragma once +// 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. + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include "coreclrhost.h" +#include "hostfxr.h" +#include "dncutil.h" +#include "dnchost.h" diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs new file mode 100644 index 00000000..f5714c67 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs @@ -0,0 +1,232 @@ +// 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. + +namespace WixToolsetTest.ManagedHost +{ + using System.IO; + using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; + using Xunit; + + public class DncHostFixture + { + [Fact] + public void CanLoadSCDEarliestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "SCDEarliestCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\EarliestCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "SelfContainedBundle.wxs"), + Path.Combine(bundleSourceFolder, "HarvestedSCD.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("EarliestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanLoadTrimmedSCDEarliestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "TrimmedSCDEarliestCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\EarliestCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "TrimmedSelfContainedBundle.wxs"), + Path.Combine(bundleSourceFolder, "HarvestedTrimmedSCD.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("EarliestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanReloadSCDEarliestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "SCDEarliestCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\EarliestCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "SelfContainedBundle.wxs"), + Path.Combine(bundleSourceFolder, "HarvestedSCD.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("EarliestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[4]); + Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]); + Assert.Equal("EarliestCoreBA", logMessages[7]); + Assert.Equal("Shutdown,Restart,0", logMessages[8]); + } + } + + [Fact] + public void CanLoadSCDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "SCDLatestCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "SelfContainedBundle.wxs"), + Path.Combine(bundleSourceFolder, "HarvestedSCD.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanLoadTrimmedSCDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "TrimmedSCDLatestCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "TrimmedSelfContainedBundle.wxs"), + Path.Combine(bundleSourceFolder, "HarvestedTrimmedSCD.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanReloadSCDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "SCDLatestCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "SelfContainedBundle.wxs"), + Path.Combine(bundleSourceFolder, "HarvestedSCD.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[4]); + Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]); + Assert.Equal("LatestCoreBA", logMessages[7]); + Assert.Equal("Shutdown,Restart,0", logMessages[8]); + } + } + } +} diff --git a/src/test/WixToolsetTest.ManagedHost/HarvestDirectoryToPayloadGroup.ps1 b/src/test/WixToolsetTest.ManagedHost/HarvestDirectoryToPayloadGroup.ps1 new file mode 100644 index 00000000..928470b0 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/HarvestDirectoryToPayloadGroup.ps1 @@ -0,0 +1,42 @@ +param([string]$RootFolder, [string]$HarvestFolder, [string]$OutputFile) + +function harvestFileToPayload { + param([System.IO.FileInfo]$file, [string]$rootFolder, [string]$harvestFolder) + + $sourceFile = $file.FullName.Substring($rootFolder.Length + 1) + $name = $sourceFile.Substring($harvestFolder.Length + 1) + $payloadContents = "" + $payloadContents +} + +function harvestDirectoryToPayloadGroup { + param([string]$rootFolder, [string]$harvestFolder, [string]$outputFile) + + $beginFileContents = @" + + + + " + [System.Environment]::NewLine + + $targetFolder = [System.IO.Path]::Combine($rootFolder, $harvestFolder) + Get-ChildItem -Path $targetFolder -Recurse -File | ForEach-Object { + $fileContents += ' ' + (harvestFileToPayload -file $_ -rootFolder $rootFolder -harvestFolder $harvestFolder) + [System.Environment]::NewLine + } + + $fileContents += $endFileContents + + [System.IO.File]::WriteAllText($outputFile, $fileContents) +} + +harvestDirectoryToPayloadGroup -rootFolder $RootFolder -harvestFolder $HarvestFolder -outputFile $OutputFile \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs new file mode 100644 index 00000000..bb8d56aa --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs new file mode 100644 index 00000000..336eef4c --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs new file mode 100644 index 00000000..4f3b2f20 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs new file mode 100644 index 00000000..15dc72bb --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs new file mode 100644 index 00000000..09433669 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs new file mode 100644 index 00000000..58ba7b39 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs new file mode 100644 index 00000000..015cc099 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs new file mode 100644 index 00000000..39e850a8 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 5026af85..1ea4522b 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -11,9 +11,23 @@ NU1701 + + ..\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj + ..\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj + $(OutputPath)examples\publish\ + + + + + + + + + + @@ -21,6 +35,17 @@ + + $(MBAPublishPath)Example.EarliestCoreMBA + + + $(MBAPublishPath)Example.LatestCoreMBA + + + + + + @@ -40,4 +65,9 @@ + + + + + diff --git a/src/test/examples/EarliestCoreMBA/EarliestCoreBA.cs b/src/test/examples/EarliestCoreMBA/EarliestCoreBA.cs new file mode 100644 index 00000000..c9291a7f --- /dev/null +++ b/src/test/examples/EarliestCoreMBA/EarliestCoreBA.cs @@ -0,0 +1,34 @@ +// 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. + +namespace Example.EarliestCoreMBA +{ + using WixToolset.Mba.Core; + + public class EarliestCoreBA : BootstrapperApplication + { + public EarliestCoreBA(IEngine engine) + : base(engine) + { + + } + + protected override void Run() + { + } + + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(EarliestCoreBA)); + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs b/src/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs new file mode 100644 index 00000000..672e17ee --- /dev/null +++ b/src/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs @@ -0,0 +1,22 @@ +// 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. + +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.EarliestCoreMBA.EarliestCoreBAFactory))] +namespace Example.EarliestCoreMBA +{ + using WixToolset.Mba.Core; + + public class EarliestCoreBAFactory : BaseBootstrapperApplicationFactory + { + private static int loadCount = 0; + + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; + return new EarliestCoreBA(engine); + } + } +} diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj new file mode 100644 index 00000000..326633ba --- /dev/null +++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -0,0 +1,18 @@ + + + + netcoreapp3.0 + win-x86;win-x64 + true + Earliest .NET Core MBA + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj new file mode 100644 index 00000000..1d325b1b --- /dev/null +++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj @@ -0,0 +1,23 @@ + + + + netcoreapp3.1 + win-x86;win-x64 + true + Latest .NET Core MBA + + + + false + true + + + + + + + + + + + \ No newline at end of file diff --git a/src/test/examples/LatestCoreMBA/LatestCoreBA.cs b/src/test/examples/LatestCoreMBA/LatestCoreBA.cs new file mode 100644 index 00000000..50386a87 --- /dev/null +++ b/src/test/examples/LatestCoreMBA/LatestCoreBA.cs @@ -0,0 +1,33 @@ +// 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. + +namespace Example.LatestCoreMBA +{ + using WixToolset.Mba.Core; + + public class LatestCoreBA : BootstrapperApplication + { + public LatestCoreBA(IEngine engine) + : base(engine) + { + } + + protected override void Run() + { + } + + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(LatestCoreBA)); + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs b/src/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs new file mode 100644 index 00000000..fff3b5c5 --- /dev/null +++ b/src/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs @@ -0,0 +1,22 @@ +// 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. + +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.LatestCoreMBA.LatestCoreBAFactory))] +namespace Example.LatestCoreMBA +{ + using WixToolset.Mba.Core; + + public class LatestCoreBAFactory : BaseBootstrapperApplicationFactory + { + private static int loadCount = 0; + + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; + return new LatestCoreBA(engine); + } + } +} diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp index 203df115..f0811e0a 100644 --- a/src/test/examples/TestEngine/TestEngine.cpp +++ b/src/test/examples/TestEngine/TestEngine.cpp @@ -35,6 +35,12 @@ HRESULT TestEngine::LoadBA( command.cbSize = sizeof(BOOTSTRAPPER_COMMAND); + hr = PathGetDirectory(wzBAFilePath, &command.wzBootstrapperWorkingFolder); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to allocate wzBootstrapperWorkingFolder"); + + hr = PathConcat(command.wzBootstrapperWorkingFolder, L"BootstrapperApplicationData.xml", &command.wzBootstrapperApplicationDataPath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to allocate wzBootstrapperApplicationDataPath"); + args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS); args.pCommand = &command; args.pfnBootstrapperEngineProc = TestEngine::EngineProc; @@ -53,6 +59,9 @@ HRESULT TestEngine::LoadBA( ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure on BootstrapperApplicationCreate."); LExit: + ReleaseStr(command.wzBootstrapperApplicationDataPath); + ReleaseStr(command.wzBootstrapperWorkingFolder); + return hr; } @@ -92,6 +101,7 @@ HRESULT TestEngine::SendStartupEvent() void TestEngine::UnloadBA() { PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = NULL; + BOOL fDisableUnloading = m_pCreateResults && m_pCreateResults->fDisableUnloading; ReleaseNullMem(m_pCreateResults); @@ -104,7 +114,11 @@ void TestEngine::UnloadBA() if (m_hBAModule) { - ::FreeLibrary(m_hBAModule); + if (!fDisableUnloading) + { + ::FreeLibrary(m_hBAModule); + } + m_hBAModule = NULL; } } diff --git a/src/test/examples/TestEngine/precomp.h b/src/test/examples/TestEngine/precomp.h index 0d2afb06..3fbc7e90 100644 --- a/src/test/examples/TestEngine/precomp.h +++ b/src/test/examples/TestEngine/precomp.h @@ -9,6 +9,7 @@ #include "logutil.h" #include "memutil.h" #include "pathutil.h" +#include "strutil.h" #include "BootstrapperEngine.h" #include "BootstrapperApplication.h" diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index da32234c..33400f3b 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -197,6 +197,15 @@ namespace WixToolset.Bal { switch (attribute.Name.LocalName) { + case "BAFactoryAssembly": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + { + section.AddTuple(new WixBalBAFactoryAssemblyTuple(sourceLineNumbers) + { + PayloadId = payloadId, + }); + } + break; case "BAFunctions": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { diff --git a/src/wixext/Tuples/BalTupleDefinitions.cs b/src/wixext/Tuples/BalTupleDefinitions.cs index 676db9f6..48199f95 100644 --- a/src/wixext/Tuples/BalTupleDefinitions.cs +++ b/src/wixext/Tuples/BalTupleDefinitions.cs @@ -4,9 +4,11 @@ namespace WixToolset.Bal { using System; using WixToolset.Data; + using WixToolset.Data.Burn; public enum BalTupleDefinitionType { + WixBalBAFactoryAssembly, WixBalBAFunctions, WixBalCondition, WixMbaPrereqInformation, @@ -32,6 +34,9 @@ namespace WixToolset.Bal { switch (type) { + case BalTupleDefinitionType.WixBalBAFactoryAssembly: + return BalTupleDefinitions.WixBalBAFactoryAssembly; + case BalTupleDefinitionType.WixBalBAFunctions: return BalTupleDefinitions.WixBalBAFunctions; @@ -51,5 +56,15 @@ namespace WixToolset.Bal throw new ArgumentOutOfRangeException(nameof(type)); } } + + static BalTupleDefinitions() + { + WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + } } } diff --git a/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs b/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs new file mode 100644 index 00000000..e33ea562 --- /dev/null +++ b/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Tuples; + + public static partial class BalTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixBalBAFactoryAssembly = new IntermediateTupleDefinition( + BalTupleDefinitionType.WixBalBAFactoryAssembly.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalBAFactoryTupleFields.PayloadId), IntermediateFieldType.String), + }, + typeof(WixBalBAFactoryAssemblyTuple)); + } +} + +namespace WixToolset.Bal.Tuples +{ + using WixToolset.Data; + + public enum WixBalBAFactoryTupleFields + { + PayloadId, + } + + public class WixBalBAFactoryAssemblyTuple : IntermediateTuple + { + public WixBalBAFactoryAssemblyTuple() : base(BalTupleDefinitions.WixBalBAFactoryAssembly, null, null) + { + } + + public WixBalBAFactoryAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalBAFactoryTupleFields index] => this.Fields[(int)index]; + + public string PayloadId + { + get => this.Fields[(int)WixBalBAFactoryTupleFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFactoryTupleFields.PayloadId, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/bal.xsd b/src/wixext/bal.xsd index 3081a279..52f9142f 100644 --- a/src/wixext/bal.xsd +++ b/src/wixext/bal.xsd @@ -9,7 +9,7 @@ xmlns="http://wixtoolset.org/schemas/v4/wxs/bal"> - The source code schema for the WiX Toolset Burn User Experience Extension. + The source code schema for the WiX Toolset Bootstrapper Application Layer Extension. @@ -215,10 +215,25 @@ + + + + When set to "yes", DotNetCoreBootstrapperApplicationHost will load the DLL and instantiate the type with the BootstrapperApplicationFactoryAttribute. + There must be corresponding deps.json and runtimeconfig.json files (set EnableDynamicLoading to True in the .NET Core project). + The .NET Core project must have been published, not just built. + Only one payload may be marked with this attribute set to "yes". + + + + + + + When set to "yes", WixStdBA will load the DLL and work with it to handle BA messages. + Only one payload may be marked with this attribute set to "yes". diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs new file mode 100644 index 00000000..65a59e61 --- /dev/null +++ b/src/wixlib/Dnc.wxs @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index c33375fe..a158cd81 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -14,6 +14,7 @@ + @@ -33,6 +34,10 @@ + + dnchost + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} + mbahost {12C87C77-3547-44F8-8134-29BC915CB19D} -- cgit v1.2.3-55-g6feb From b7faab06259d3afdc3205024a0004ace72157cbe Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 29 Apr 2020 19:31:01 +1000 Subject: Treat failing to load SCD like mbahost treats .NET 4.5.2 on Win7 RTM. --- src/dnchost/dnchost.cpp | 87 ++++++++++++++++++++-- src/dnchost/dnchost.h | 8 ++ src/mbahost/mbahost.cpp | 2 + src/wixlib/Dnc.wxs | 10 +++ src/wixstdba/Resources/dncpreq.thm | 47 ++++++++++++ src/wixstdba/Resources/dncpreq.wxl | 29 ++++++++ .../WixStandardBootstrapperApplication.cpp | 26 ++++++- src/wixstdba/wixstdba.cpp | 26 +++++++ src/wixstdba/wixstdba.def | 2 + 9 files changed, 228 insertions(+), 9 deletions(-) create mode 100644 src/wixstdba/Resources/dncpreq.thm create mode 100644 src/wixstdba/Resources/dncpreq.wxl (limited to 'src') diff --git a/src/dnchost/dnchost.cpp b/src/dnchost/dnchost.cpp index c4b0d222..0fad58c1 100644 --- a/src/dnchost/dnchost.cpp +++ b/src/dnchost/dnchost.cpp @@ -20,6 +20,13 @@ static HRESULT LoadRuntime( static HRESULT LoadManagedBootstrapperApplicationFactory( __in DNCSTATE* pState ); +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in LPCWSTR wzAppBase, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); // function definitions @@ -51,6 +58,7 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate( ) { HRESULT hr = S_OK; + HRESULT hrHostInitialization = S_OK; IBootstrapperEngine* pEngine = NULL; // coreclr.dll doesn't support unloading, so the rest of the .NET Core hosting stack doesn't support it either. @@ -77,18 +85,32 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate( if (!vstate.fInitializedRuntime) { hr = LoadRuntime(&vstate); - BalExitOnFailure(hr, "Failed to load .NET Core runtime."); - - vstate.fInitializedRuntime = TRUE; - hr = LoadManagedBootstrapperApplicationFactory(&vstate); - BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application factory."); + vstate.fInitializedRuntime = SUCCEEDED(hr); } - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading .NET Core SCD bootstrapper application."); + if (vstate.fInitializedRuntime) + { + if (!vstate.pAppFactory) + { + hr = LoadManagedBootstrapperApplicationFactory(&vstate); + BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application factory."); + } + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading .NET Core SCD bootstrapper application."); + + hr = vstate.pAppFactory->Create(pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application."); + } + else // fallback to the prerequisite BA. + { + hrHostInitialization = E_DNCHOST_SCD_RUNTIME_FAILURE; + BalLogError(hr, "The self-contained .NET Core runtime failed to load. This is an unrecoverable error."); + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because .NET Core host could not be loaded, error: 0x%08x.", hr); - hr = vstate.pAppFactory->Create(pArgs, pResults); - BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application."); + hr = CreatePrerequisiteBA(hrHostInitialization, pEngine, vstate.sczAppBase, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application."); + } LExit: ReleaseNullObject(pEngine); @@ -98,6 +120,18 @@ LExit: extern "C" void WINAPI BootstrapperApplicationDestroy() { + if (vstate.hMbapreqModule) + { + PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast(::GetProcAddress(vstate.hMbapreqModule, "DncPrereqBootstrapperApplicationDestroy")); + if (pfnDestroy) + { + (*pfnDestroy)(); + } + + ::FreeLibrary(vstate.hMbapreqModule); + vstate.hMbapreqModule = NULL; + } + BalUninitialize(); } @@ -227,3 +261,40 @@ static HRESULT LoadManagedBootstrapperApplicationFactory( return hr; } + +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in LPCWSTR wzAppBase, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + LPWSTR sczDncpreqPath = NULL; + HMODULE hModule = NULL; + + hr = PathConcat(wzAppBase, L"dncpreq.dll", &sczDncpreqPath); + BalExitOnFailure(hr, "Failed to get path to pre-requisite BA."); + + hModule = ::LoadLibraryW(sczDncpreqPath); + BalExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL."); + + PFN_DNCPREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast(::GetProcAddress(hModule, "DncPrereqBootstrapperApplicationCreate")); + BalExitOnNullWithLastError(pfnCreate, hr, "Failed to get DncPrereqBootstrapperApplicationCreate entry-point from: %ls", sczDncpreqPath); + + hr = pfnCreate(hrHostInitialization, pEngine, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create prequisite bootstrapper app."); + + vstate.hMbapreqModule = hModule; + hModule = NULL; + +LExit: + if (hModule) + { + ::FreeLibrary(hModule); + } + ReleaseStr(sczDncpreqPath); + + return hr; +} diff --git a/src/dnchost/dnchost.h b/src/dnchost/dnchost.h index e498edaf..40c506fc 100644 --- a/src/dnchost/dnchost.h +++ b/src/dnchost/dnchost.h @@ -2,6 +2,13 @@ // 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. +extern "C" typedef HRESULT(WINAPI* PFN_DNCPREQ_BOOTSTRAPPER_APPLICATION_CREATE)( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); + struct DNCSTATE { BOOL fInitialized; @@ -16,4 +23,5 @@ struct DNCSTATE LPWSTR sczBaFactoryRuntimeConfigPath; HOSTFXR_STATE hostfxrState; IBootstrapperApplicationFactory* pAppFactory; + HMODULE hMbapreqModule; }; diff --git a/src/mbahost/mbahost.cpp b/src/mbahost/mbahost.cpp index 7916ec9a..735f9f21 100644 --- a/src/mbahost/mbahost.cpp +++ b/src/mbahost/mbahost.cpp @@ -129,6 +129,8 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate( } LExit: + ReleaseNullObject(pEngine); + return hr; } diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs index 65a59e61..a2779c19 100644 --- a/src/wixlib/Dnc.wxs +++ b/src/wixlib/Dnc.wxs @@ -9,6 +9,7 @@ + @@ -16,6 +17,15 @@ + + + + + + + + + diff --git a/src/wixstdba/Resources/dncpreq.thm b/src/wixstdba/Resources/dncpreq.thm new file mode 100644 index 00000000..4ae61819 --- /dev/null +++ b/src/wixstdba/Resources/dncpreq.thm @@ -0,0 +1,47 @@ + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + #(loc.InstallLicenseTerms) + + + + + + + + + + + + + #(loc.FailureLogLinkText) + + + + + + + diff --git a/src/wixstdba/Resources/dncpreq.wxl b/src/wixstdba/Resources/dncpreq.wxl new file mode 100644 index 00000000..d6b73b5f --- /dev/null +++ b/src/wixstdba/Resources/dncpreq.wxl @@ -0,0 +1,29 @@ + + + + + + [WixBundleName] Setup + Microsoft .NET Core required for [WixBundleName] setup + Are you sure you want to cancel? + Setup Help + /passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + Click the "Accept and Install" button to accept the Microsoft .NET Core <a href="#">license terms</a>. + &Accept and Install + &Decline + Setup Progress + Processing: + &Cancel + Setup Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + [WixBundleName] cannot run on this machine. Install the latest updates and/or the latest OS to run in a supported environment. + No action was taken as a system reboot is required. + diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 88a26534..826c4386 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -2892,6 +2892,23 @@ private: // privates } } } + else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal) + { + HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.SCDRUNTIMEFAILUREErrorMessage)", 0); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to initialize SCDRUNTIMEFAILUREErrorMessage loc identifier."); + } + else + { + hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to localize SCDRUNTIMEFAILUREErrorMessage: %ls", sczUnformattedText); + ReleaseNullStr(sczUnformattedText); + } + } + } else // try to get the error message from the error code. { StrAllocFromError(&sczUnformattedText, m_hrFinal, NULL); @@ -2915,6 +2932,13 @@ private: // privates BalFormatString(sczUnformattedText, &sczText); } } + else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal) + { + if (sczUnformattedText) + { + BalFormatString(sczUnformattedText, &sczText); + } + } else { StrAllocFormatted(&sczText, L"0x%08x - %ls", m_hrFinal, sczUnformattedText); @@ -3754,7 +3778,7 @@ HRESULT CreateBootstrapperApplication( if (BOOTSTRAPPER_DISPLAY_UNKNOWN == pArgs->pCommand->display) { - ExitOnFailure(hr = E_INVALIDARG, "Engine requested Unknown display type."); + BalExitOnFailure(hr = E_INVALIDARG, "Engine requested Unknown display type."); } pApplication = new CWixStandardBootstrapperApplication(hModule, fPrereq, hrHostInitialization, pEngine, pArgs); diff --git a/src/wixstdba/wixstdba.cpp b/src/wixstdba/wixstdba.cpp index 2767c74e..727c8cb0 100644 --- a/src/wixstdba/wixstdba.cpp +++ b/src/wixstdba/wixstdba.cpp @@ -55,6 +55,32 @@ extern "C" void WINAPI BootstrapperApplicationDestroy() } +extern "C" HRESULT WINAPI DncPrereqBootstrapperApplicationCreate( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + + BalInitialize(pEngine); + + hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication); + BalExitOnFailure(hr, "Failed to create .NET Core prerequisite bootstrapper application interface."); + +LExit: + return hr; +} + + +extern "C" void WINAPI DncPrereqBootstrapperApplicationDestroy() +{ + ReleaseNullObject(vpApplication); + BalUninitialize(); +} + + extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate( __in HRESULT hrHostInitialization, __in IBootstrapperEngine* pEngine, diff --git a/src/wixstdba/wixstdba.def b/src/wixstdba/wixstdba.def index 815d2977..ba9980d3 100644 --- a/src/wixstdba/wixstdba.def +++ b/src/wixstdba/wixstdba.def @@ -4,5 +4,7 @@ EXPORTS BootstrapperApplicationCreate BootstrapperApplicationDestroy + DncPrereqBootstrapperApplicationCreate + DncPrereqBootstrapperApplicationDestroy MbaPrereqBootstrapperApplicationCreate MbaPrereqBootstrapperApplicationDestroy -- cgit v1.2.3-55-g6feb From a79ce0b907676e50332139b4c4a8acb5d22a4b46 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 29 Apr 2020 19:32:42 +1000 Subject: Add support for FDD in DotNetCoreBootstrapperApplicationHost. --- src/dnchost/dnchost.cpp | 34 ++++++- src/dnchost/dnchost.h | 8 ++ .../WixToolsetTest.ManagedHost/DncHostFixture.cs | 107 +++++++++++++++++++++ .../EarliestCoreMBA/FrameworkDependentBundle.wxs | 17 ++++ .../EarliestCoreMBA/SelfContainedBundle.wxs | 1 + .../EarliestCoreMBA/TrimmedSelfContainedBundle.wxs | 1 + .../LatestCoreMBA/FrameworkDependentBundle.wxs | 17 ++++ .../TestData/LatestCoreMBA/SelfContainedBundle.wxs | 1 + .../LatestCoreMBA/TrimmedSelfContainedBundle.wxs | 1 + .../WixToolsetTest.ManagedHost.csproj | 3 + src/wixext/BalBurnBackendExtension.cs | 26 ++++- src/wixext/BalCompiler.cs | 86 ++++++++++++++++- src/wixext/BalErrors.cs | 12 ++- src/wixext/Tuples/BalTupleDefinitions.cs | 5 + src/wixext/Tuples/WixDncOptionsTuple.cs | 47 +++++++++ src/wixext/bal.xsd | 36 +++++++ src/wixlib/Dnc.wxs | 25 +++++ 17 files changed, 415 insertions(+), 12 deletions(-) create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/FrameworkDependentBundle.wxs create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/FrameworkDependentBundle.wxs create mode 100644 src/wixext/Tuples/WixDncOptionsTuple.cs (limited to 'src') diff --git a/src/dnchost/dnchost.cpp b/src/dnchost/dnchost.cpp index 0fad58c1..503537c0 100644 --- a/src/dnchost/dnchost.cpp +++ b/src/dnchost/dnchost.cpp @@ -97,15 +97,22 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate( BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application factory."); } - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading .NET Core SCD bootstrapper application."); + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading .NET Core %ls bootstrapper application.", DNCHOSTTYPE_FDD == vstate.type ? L"FDD" : L"SCD"); hr = vstate.pAppFactory->Create(pArgs, pResults); BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application."); } else // fallback to the prerequisite BA. { - hrHostInitialization = E_DNCHOST_SCD_RUNTIME_FAILURE; - BalLogError(hr, "The self-contained .NET Core runtime failed to load. This is an unrecoverable error."); + if (DNCHOSTTYPE_SCD == vstate.type) + { + hrHostInitialization = E_DNCHOST_SCD_RUNTIME_FAILURE; + BalLogError(hr, "The self-contained .NET Core runtime failed to load. This is an unrecoverable error."); + } + else + { + hrHostInitialization = S_OK; + } BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because .NET Core host could not be loaded, error: 0x%08x.", hr); hr = CreatePrerequisiteBA(hrHostInitialization, pEngine, vstate.sczAppBase, pArgs, pResults); @@ -166,6 +173,7 @@ static HRESULT LoadDncConfiguration( LPWSTR sczPayloadId = NULL; LPWSTR sczPayloadXPath = NULL; LPWSTR sczPayloadName = NULL; + DWORD dwBool = 0; hr = XmlLoadDocumentFromFile(pArgs->pCommand->wzBootstrapperApplicationDataPath, &pixdManifest); BalExitOnFailure(hr, "Failed to load BalManifest '%ls'", pArgs->pCommand->wzBootstrapperApplicationDataPath); @@ -220,6 +228,26 @@ static HRESULT LoadDncConfiguration( hr = StrAllocConcat(&pState->sczBaFactoryRuntimeConfigPath, L".runtimeconfig.json", 0); BalExitOnFailure(hr, "Failed to concat extension to runtime config path."); + pState->type = DNCHOSTTYPE_FDD; + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixDncOptions", &pixnHost); + if (S_FALSE == hr) + { + ExitFunction1(hr = S_OK); + } + BalExitOnFailure(hr, "Failed to find WixDncOptions element in bootstrapper application config."); + + hr = XmlGetAttributeNumber(pixnHost, L"SelfContainedDeployment", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr) && dwBool) + { + pState->type = DNCHOSTTYPE_SCD; + } + BalExitOnFailure(hr, "Failed to get SelfContainedDeployment value."); + LExit: ReleaseStr(sczPayloadName); ReleaseObject(pixnPayload); diff --git a/src/dnchost/dnchost.h b/src/dnchost/dnchost.h index 40c506fc..22fd8f5e 100644 --- a/src/dnchost/dnchost.h +++ b/src/dnchost/dnchost.h @@ -2,6 +2,13 @@ // 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. +enum DNCHOSTTYPE +{ + DNCHOSTTYPE_UNKNOWN, + DNCHOSTTYPE_FDD, + DNCHOSTTYPE_SCD, +}; + extern "C" typedef HRESULT(WINAPI* PFN_DNCPREQ_BOOTSTRAPPER_APPLICATION_CREATE)( __in HRESULT hrHostInitialization, __in IBootstrapperEngine* pEngine, @@ -21,6 +28,7 @@ struct DNCSTATE LPWSTR sczBaFactoryAssemblyPath; LPWSTR sczBaFactoryDepsJsonPath; LPWSTR sczBaFactoryRuntimeConfigPath; + DNCHOSTTYPE type; HOSTFXR_STATE hostfxrState; IBootstrapperApplicationFactory* pAppFactory; HMODULE hMbapreqModule; diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs index f5714c67..7f40ee26 100644 --- a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs @@ -9,6 +9,40 @@ namespace WixToolsetTest.ManagedHost public class DncHostFixture { + [Fact] + public void CanLoadFDDEarliestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "FDDEarliestCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\EarliestCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("EarliestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + [Fact] public void CanLoadSCDEarliestCoreMBA() { @@ -119,6 +153,79 @@ namespace WixToolsetTest.ManagedHost } } + [Fact] + public void CanLoadFDDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "FDDLatestCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanReloadFDDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "FDDLatestCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[4]); + Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]); + Assert.Equal("LatestCoreBA", logMessages[7]); + Assert.Equal("Shutdown,Restart,0", logMessages[8]); + } + } + [Fact] public void CanLoadSCDLatestCoreMBA() { diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/FrameworkDependentBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..5cec494d --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/FrameworkDependentBundle.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs index 4f3b2f20..d951ffc6 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs @@ -3,6 +3,7 @@ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs index 15dc72bb..816524ed 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs @@ -3,6 +3,7 @@ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/FrameworkDependentBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..22fb3d8b --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/FrameworkDependentBundle.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs index 015cc099..4b0fe38a 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs @@ -3,6 +3,7 @@ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs index 39e850a8..eee87933 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs @@ -3,6 +3,7 @@ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> + diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 1ea4522b..958c63fc 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -18,12 +18,14 @@ + + @@ -67,6 +69,7 @@ + diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index 71cd2d92..c81955be 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -28,15 +28,17 @@ namespace WixToolset.Bal var isStdBA = baId.StartsWith("WixStandardBootstrapperApplication"); var isMBA = baId.StartsWith("ManagedBootstrapperApplicationHost"); + var isDNC = baId.StartsWith("DotNetCoreBootstrapperApplicationHost"); + var isSCD = isDNC && this.VerifySCD(section); - if (isStdBA || isMBA) + if (isStdBA || isMBA || isDNC) { this.VerifyBAFunctions(section); } - if (isMBA) + if (isMBA || (isDNC && !isSCD)) { - this.VerifyPrereqPackages(section); + this.VerifyPrereqPackages(section, isDNC); } } @@ -78,12 +80,13 @@ namespace WixToolset.Bal } } - private void VerifyPrereqPackages(IntermediateSection section) + private void VerifyPrereqPackages(IntermediateSection section, bool isDNC) { var prereqInfoTuples = section.Tuples.OfType().ToList(); if (prereqInfoTuples.Count == 0) { - this.Messaging.Write(BalErrors.MissingPrereq()); + var message = isDNC ? BalErrors.MissingDNCPrereq() : BalErrors.MissingMBAPrereq(); + this.Messaging.Write(message); return; } @@ -115,5 +118,18 @@ namespace WixToolset.Bal } } } + + private bool VerifySCD(IntermediateSection section) + { + var isSCD = false; + + var dncOptions = section.Tuples.OfType().SingleOrDefault(); + if (dncOptions != null) + { + isSCD = dncOptions.SelfContainedDeployment != 0; + } + + return isSCD; + } } } diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 33400f3b..dfe29bde 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -63,6 +63,9 @@ namespace WixToolset.Bal case "WixManagedBootstrapperApplicationHost": this.ParseWixManagedBootstrapperApplicationHostElement(intermediate, section, element); break; + case "WixDotNetCoreBootstrapperApplication": + this.ParseWixDotNetCoreBootstrapperApplicationElement(intermediate, section, element); + break; default: this.ParseHelper.UnexpectedElement(parentElement, element); break; @@ -200,7 +203,9 @@ namespace WixToolset.Bal case "BAFactoryAssembly": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - section.AddTuple(new WixBalBAFactoryAssemblyTuple(sourceLineNumbers) + // There can only be one. + var id = new Identifier(AccessModifier.Public, "TheBAFactoryAssembly"); + section.AddTuple(new WixBalBAFactoryAssemblyTuple(sourceLineNumbers, id) { PayloadId = payloadId, }); @@ -655,5 +660,84 @@ namespace WixToolset.Bal } } } + + /// + /// Parses a WixDotNetCoreBootstrapperApplication element for Bundles. + /// + /// The element to parse. + private void ParseWixDotNetCoreBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + string logoFile = null; + string themeFile = null; + string localizationFile = null; + var selfContainedDeployment = YesNoType.NotSet; + + foreach (var attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "LogoFile": + logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ThemeFile": + themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LocalizationFile": + localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "SelfContainedDeployment": + selfContainedDeployment = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + + if (!this.Messaging.EncounteredError) + { + if (!String.IsNullOrEmpty(logoFile)) + { + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) + { + Value = logoFile, + }); + } + + if (!String.IsNullOrEmpty(themeFile)) + { + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml")) + { + Value = themeFile, + }); + } + + if (!String.IsNullOrEmpty(localizationFile)) + { + section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl")) + { + Value = localizationFile, + }); + } + + if (YesNoType.Yes == selfContainedDeployment) + { + section.AddTuple(new WixDncOptionsTuple(sourceLineNumbers) + { + SelfContainedDeployment = 1, + }); + } + } + } } } diff --git a/src/wixext/BalErrors.cs b/src/wixext/BalErrors.cs index 5591ae1d..bc0186c1 100644 --- a/src/wixext/BalErrors.cs +++ b/src/wixext/BalErrors.cs @@ -18,9 +18,14 @@ namespace WixToolset.Bal return Message(sourceLineNumbers, Ids.BAFunctionsPayloadRequiredInUXContainer, "The BAFunctions DLL Payload element must be located inside the BootstrapperApplication container."); } - public static Message MissingPrereq() + public static Message MissingDNCPrereq() { - return Message(null, Ids.MissingPrereq, "There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups."); + return Message(null, Ids.MissingDNCPrereq, "There must be at least one PrereqPackage when using the DotNetCoreBootstrapperApplicationHost with SelfContainedDeployment set to \"no\"."); + } + + public static Message MissingMBAPrereq() + { + return Message(null, Ids.MissingMBAPrereq, "There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups."); } public static Message MultipleBAFunctions(SourceLineNumber sourceLineNumbers) @@ -46,10 +51,11 @@ namespace WixToolset.Bal public enum Ids { AttributeRequiresPrereqPackage = 6801, - MissingPrereq = 6802, + MissingMBAPrereq = 6802, MultiplePrereqLicenses = 6803, MultipleBAFunctions = 6804, BAFunctionsPayloadRequiredInUXContainer = 6805, + MissingDNCPrereq = 6806, } } } diff --git a/src/wixext/Tuples/BalTupleDefinitions.cs b/src/wixext/Tuples/BalTupleDefinitions.cs index 48199f95..9a294703 100644 --- a/src/wixext/Tuples/BalTupleDefinitions.cs +++ b/src/wixext/Tuples/BalTupleDefinitions.cs @@ -11,6 +11,7 @@ namespace WixToolset.Bal WixBalBAFactoryAssembly, WixBalBAFunctions, WixBalCondition, + WixDncOptions, WixMbaPrereqInformation, WixStdbaOptions, WixStdbaOverridableVariable, @@ -43,6 +44,9 @@ namespace WixToolset.Bal case BalTupleDefinitionType.WixBalCondition: return BalTupleDefinitions.WixBalCondition; + case BalTupleDefinitionType.WixDncOptions: + return BalTupleDefinitions.WixDncOptions; + case BalTupleDefinitionType.WixMbaPrereqInformation: return BalTupleDefinitions.WixMbaPrereqInformation; @@ -62,6 +66,7 @@ namespace WixToolset.Bal WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); diff --git a/src/wixext/Tuples/WixDncOptionsTuple.cs b/src/wixext/Tuples/WixDncOptionsTuple.cs new file mode 100644 index 00000000..8a36879b --- /dev/null +++ b/src/wixext/Tuples/WixDncOptionsTuple.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Tuples; + + public static partial class BalTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixDncOptions = new IntermediateTupleDefinition( + BalTupleDefinitionType.WixDncOptions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixDncOptionsTupleFields.SelfContainedDeployment), IntermediateFieldType.Number), + }, + typeof(WixDncOptionsTuple)); + } +} + +namespace WixToolset.Bal.Tuples +{ + using WixToolset.Data; + + public enum WixDncOptionsTupleFields + { + SelfContainedDeployment, + } + + public class WixDncOptionsTuple : IntermediateTuple + { + public WixDncOptionsTuple() : base(BalTupleDefinitions.WixDncOptions, null, null) + { + } + + public WixDncOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixDncOptions, sourceLineNumber, id) + { + } + + public IntermediateField this[WixDncOptionsTupleFields index] => this.Fields[(int)index]; + + public int SelfContainedDeployment + { + get => this.Fields[(int)WixDncOptionsTupleFields.SelfContainedDeployment].AsNumber(); + set => this.Set((int)WixDncOptionsTupleFields.SelfContainedDeployment, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/bal.xsd b/src/wixext/bal.xsd index 52f9142f..ee1f8cec 100644 --- a/src/wixext/bal.xsd +++ b/src/wixext/bal.xsd @@ -215,6 +215,42 @@ + + + + Configures the DotNetCoreBootstrapperApplicationHost for a Bundle. + + + + + + + + + Source file of the logo graphic. + + + + + Source file of the theme XML. + + + + + Source file of the theme localization .wxl file. + + + + + + Whether the .NET Core BA was published as self-contained (SCD). + If using PublishTrimmed in the .NET Core project, there must be an item group with <TrimmerRootAssembly Include="System.Runtime.Loader" /> + + + + + + diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs index a2779c19..2a27050f 100644 --- a/src/wixlib/Dnc.wxs +++ b/src/wixlib/Dnc.wxs @@ -13,6 +13,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-55-g6feb From ae1751902076edfd8978b7fb42f24d3ac3f7ad55 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 29 Apr 2020 19:36:24 +1000 Subject: Add WPF .NET Core test. --- Bal.wixext.sln | 17 ++++- .../WixToolsetTest.ManagedHost/DncHostFixture.cs | 34 +++++++++ .../WPFCoreMBA/FrameworkDependentBundle.wxs | 17 +++++ .../WixToolsetTest.ManagedHost.csproj | 17 ++++- .../examples/TestEngine/Example.TestEngine.vcxproj | 2 + src/test/examples/TestEngine/ExampleTestEngine.cpp | 21 +++++- src/test/examples/TestEngine/ReloadEngine.cpp | 12 ++++ src/test/examples/TestEngine/ShutdownEngine.cpp | 6 ++ src/test/examples/TestEngine/TestEngine.cpp | 83 ++++++++++++++++++++-- src/test/examples/TestEngine/TestEngine.h | 35 ++++++++- src/test/examples/TestEngine/WaitForQuitEngine.cpp | 35 +++++++++ src/test/examples/TestEngine/WaitForQuitEngine.h | 8 +++ src/test/examples/TestEngine/precomp.h | 1 + src/test/examples/WPFCoreMBA/AssemblyInfo.cs | 12 ++++ .../examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 16 +++++ src/test/examples/WPFCoreMBA/MainWindow.xaml | 16 +++++ src/test/examples/WPFCoreMBA/MainWindow.xaml.cs | 17 +++++ src/test/examples/WPFCoreMBA/WPFCoreBA.cs | 42 +++++++++++ src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs | 22 ++++++ 19 files changed, 400 insertions(+), 13 deletions(-) create mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs create mode 100644 src/test/examples/TestEngine/WaitForQuitEngine.cpp create mode 100644 src/test/examples/TestEngine/WaitForQuitEngine.h create mode 100644 src/test/examples/WPFCoreMBA/AssemblyInfo.cs create mode 100644 src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj create mode 100644 src/test/examples/WPFCoreMBA/MainWindow.xaml create mode 100644 src/test/examples/WPFCoreMBA/MainWindow.xaml.cs create mode 100644 src/test/examples/WPFCoreMBA/WPFCoreBA.cs create mode 100644 src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs (limited to 'src') diff --git a/Bal.wixext.sln b/Bal.wixext.sln index b4b384af..7fcfe556 100644 --- a/Bal.wixext.sln +++ b/Bal.wixext.sln @@ -13,7 +13,7 @@ Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixpr EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Dnc.Host", "src\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj", "{0D780900-C2FF-4FA2-8CB5-8A19768724C5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.Host", "src\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj", "{0D780900-C2FF-4FA2-8CB5-8A19768724C5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" EndProject @@ -35,6 +35,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnchost", "src\dnchost\dnch EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.LatestCoreMBA", "src\test\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj", "{A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.WPFCoreMBA", "src\test\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj", "{8E707BF2-FD72-4649-8727-BA5955D48D40}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -215,6 +217,18 @@ Global {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.Build.0 = Release|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.ActiveCfg = Release|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.Build.0 = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.ActiveCfg = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.Build.0 = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.ActiveCfg = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.Build.0 = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.Build.0 = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.ActiveCfg = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.Build.0 = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x86.ActiveCfg = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -225,6 +239,7 @@ Global {44297646-706D-4508-8E96-1B35B109694C} = {C70E3534-A018-4D0A-A340-916C9777EEF7} {1E86D8DF-DABD-4B6E-A812-64CD2040C73A} = {C70E3534-A018-4D0A-A340-916C9777EEF7} {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {8E707BF2-FD72-4649-8727-BA5955D48D40} = {C70E3534-A018-4D0A-A340-916C9777EEF7} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {74046961-48BF-467A-A6C2-F886C75CE0BE} diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs index 7f40ee26..f33709ab 100644 --- a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs @@ -335,5 +335,39 @@ namespace WixToolsetTest.ManagedHost Assert.Equal("Shutdown,Restart,0", logMessages[8]); } } + + [Fact] + public void CanLoadFDDWPFCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var binFolder = Path.Combine(baseFolder, "bin"); + var bundleFile = Path.Combine(binFolder, "FDDWPFCoreMBA.exe"); + var baSourceFolder = TestData.Get(@"..\examples"); + var bundleSourceFolder = TestData.Get(@"TestData\WPFCoreMBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", baSourceFolder, + "-burnStub", TestEngine.BurnStubFile, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("WPFCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } } } diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..ecc5e8c1 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 958c63fc..ff472322 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -14,6 +14,7 @@ ..\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj ..\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj + ..\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj $(OutputPath)examples\publish\ @@ -30,6 +31,7 @@ + @@ -43,11 +45,17 @@ $(MBAPublishPath)Example.LatestCoreMBA + + $(MBAPublishPath)Example.WPFCoreMBA + true + true + + @@ -69,8 +77,11 @@ - - - + + + diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index be52105b..b9425295 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -50,12 +50,14 @@ + + diff --git a/src/test/examples/TestEngine/ExampleTestEngine.cpp b/src/test/examples/TestEngine/ExampleTestEngine.cpp index a378c9a3..fc1938fe 100644 --- a/src/test/examples/TestEngine/ExampleTestEngine.cpp +++ b/src/test/examples/TestEngine/ExampleTestEngine.cpp @@ -4,9 +4,15 @@ int __cdecl wmain(int argc, LPWSTR argv[]) { - HRESULT hr = E_INVALIDARG; + HRESULT hr = S_OK; + BOOL fComInitialized = FALSE; BOOL fShowUsage = FALSE; + // initialize COM + hr = ::CoInitializeEx(NULL, COINIT_MULTITHREADED); + ExitOnFailure(hr, "Failed to initialize COM."); + fComInitialized = TRUE; + ConsoleInitialize(); if (argc != 4) @@ -21,6 +27,10 @@ int __cdecl wmain(int argc, LPWSTR argv[]) { hr = RunShutdownEngine(argv[2], argv[3]); } + else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"waitforquit", -1)) + { + hr = RunWaitForQuitEngine(argv[2], argv[3]); + } else { fShowUsage = TRUE; @@ -28,9 +38,16 @@ int __cdecl wmain(int argc, LPWSTR argv[]) if (fShowUsage) { - ConsoleWriteError(hr, CONSOLE_COLOR_RED, "Usage: {reload|shutdown} Example.TestEngine.exe Bundle.exe BA.dll"); + ConsoleWriteError(hr = E_INVALIDARG, CONSOLE_COLOR_RED, "Usage: Example.TestEngine.exe {reload|shutdown|waitforquit} Bundle.exe BA.dll"); } ConsoleUninitialize(); + +LExit: + if (fComInitialized) + { + ::CoUninitialize(); + } + return hr; } diff --git a/src/test/examples/TestEngine/ReloadEngine.cpp b/src/test/examples/TestEngine/ReloadEngine.cpp index 83541672..46fd9afa 100644 --- a/src/test/examples/TestEngine/ReloadEngine.cpp +++ b/src/test/examples/TestEngine/ReloadEngine.cpp @@ -22,6 +22,12 @@ HRESULT RunReloadEngine( hr = pTestEngine->SendStartupEvent(); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + hr = pTestEngine->SimulateQuit(0); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit."); + + hr = pTestEngine->RunApplication(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); @@ -33,6 +39,12 @@ HRESULT RunReloadEngine( hr = pTestEngine->SendStartupEvent(); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + hr = pTestEngine->SimulateQuit(0); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit."); + + hr = pTestEngine->RunApplication(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); diff --git a/src/test/examples/TestEngine/ShutdownEngine.cpp b/src/test/examples/TestEngine/ShutdownEngine.cpp index 0dfbb429..3b876e4e 100644 --- a/src/test/examples/TestEngine/ShutdownEngine.cpp +++ b/src/test/examples/TestEngine/ShutdownEngine.cpp @@ -22,6 +22,12 @@ HRESULT RunShutdownEngine( hr = pTestEngine->SendStartupEvent(); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + hr = pTestEngine->SimulateQuit(0); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit."); + + hr = pTestEngine->RunApplication(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp index f0811e0a..7b7dafce 100644 --- a/src/test/examples/TestEngine/TestEngine.cpp +++ b/src/test/examples/TestEngine/TestEngine.cpp @@ -7,12 +7,15 @@ HRESULT TestEngine::Initialize( ) { HRESULT hr = S_OK; + MSG msg = { }; LogInitialize(::GetModuleHandleW(NULL)); hr = LogOpen(NULL, PathFile(wzBundleFilePath), NULL, L"txt", FALSE, FALSE, NULL); ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to open log."); + ::PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + LExit: return hr; } @@ -73,6 +76,29 @@ HRESULT TestEngine::Log( return ConsoleWriteLine(CONSOLE_COLOR_NORMAL, "%ls", wzMessage); } +HRESULT TestEngine::RunApplication() +{ + HRESULT hr = S_OK; + MSG msg = { }; + BOOL fRet = FALSE; + + // Enter the message pump. + while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0))) + { + if (-1 == fRet) + { + ConsoleExitOnFailure(hr = E_UNEXPECTED, CONSOLE_COLOR_RED, "Unexpected return value from message pump."); + } + else + { + ProcessBAMessage(&msg); + } + } + +LExit: + return hr; +} + HRESULT TestEngine::SendShutdownEvent( __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction ) @@ -98,6 +124,21 @@ HRESULT TestEngine::SendStartupEvent() return hr; } +HRESULT TestEngine::SimulateQuit( + __in DWORD dwExitCode + ) +{ + BAENGINE_QUIT_ARGS args = { }; + BAENGINE_QUIT_RESULTS results = { }; + + args.cbSize = sizeof(BAENGINE_QUIT_ARGS); + args.dwExitCode = dwExitCode; + + results.cbSize = sizeof(BAENGINE_QUIT_RESULTS); + + return BAEngineQuit(&args, &results); +} + void TestEngine::UnloadBA() { PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = NULL; @@ -124,12 +165,27 @@ void TestEngine::UnloadBA() } HRESULT TestEngine::BAEngineLog( - __in TestEngine* pContext, __in BAENGINE_LOG_ARGS* pArgs, __in BAENGINE_LOG_RESULTS* /*pResults*/ ) { - return pContext->Log(pArgs->wzMessage); + return Log(pArgs->wzMessage); +} + +HRESULT TestEngine::BAEngineQuit( + __in BAENGINE_QUIT_ARGS* pArgs, + __in BAENGINE_QUIT_RESULTS* /*pResults*/ + ) +{ + HRESULT hr = S_OK; + + if (!::PostThreadMessageW(m_dwThreadId, WM_TESTENG_QUIT, static_cast(pArgs->dwExitCode), 0)) + { + ExitWithLastError(hr, "Failed to post shutdown message."); + } + +LExit: + return hr; } HRESULT WINAPI TestEngine::EngineProc( @@ -150,8 +206,10 @@ HRESULT WINAPI TestEngine::EngineProc( switch (message) { case BOOTSTRAPPER_ENGINE_MESSAGE_LOG: - hr = BAEngineLog(pContext, reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + hr = pContext->BAEngineLog(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; + case BOOTSTRAPPER_ENGINE_MESSAGE_QUIT: + hr = pContext->BAEngineQuit(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); default: hr = E_NOTIMPL; break; @@ -161,13 +219,30 @@ LExit: return hr; } +HRESULT TestEngine::ProcessBAMessage( + __in const MSG* pmsg + ) +{ + HRESULT hr = S_OK; + + switch (pmsg->message) + { + case WM_TESTENG_QUIT: + ::PostQuitMessage(static_cast(pmsg->wParam)); // go bye-bye. + break; + } + + return hr; +} + TestEngine::TestEngine() { m_hBAModule = NULL; m_pCreateResults = NULL; + m_dwThreadId = ::GetCurrentThreadId(); } TestEngine::~TestEngine() { ReleaseMem(m_pCreateResults); -} \ No newline at end of file +} diff --git a/src/test/examples/TestEngine/TestEngine.h b/src/test/examples/TestEngine/TestEngine.h index cf1c8aac..14b69999 100644 --- a/src/test/examples/TestEngine/TestEngine.h +++ b/src/test/examples/TestEngine/TestEngine.h @@ -2,6 +2,20 @@ // 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. +enum WM_TESTENG +{ + WM_TESTENG_FIRST = WM_APP + 0xFFF, // this enum value must always be first. + + WM_TESTENG_DETECT, + WM_TESTENG_PLAN, + WM_TESTENG_ELEVATE, + WM_TESTENG_APPLY, + WM_TESTENG_LAUNCH_APPROVED_EXE, + WM_TESTENG_QUIT, + + WM_TESTENG_LAST, // this enum value must always be last. +}; + class TestEngine { public: @@ -17,19 +31,29 @@ public: __in LPCWSTR wzMessage ); + HRESULT RunApplication(); + HRESULT SendShutdownEvent( __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction ); HRESULT SendStartupEvent(); + HRESULT SimulateQuit( + __in DWORD dwExitCode + ); + void UnloadBA(); private: - static HRESULT BAEngineLog( - __in TestEngine* pContext, + HRESULT BAEngineLog( __in BAENGINE_LOG_ARGS* pArgs, - __in BAENGINE_LOG_RESULTS* /*pResults*/ + __in BAENGINE_LOG_RESULTS* pResults + ); + + HRESULT BAEngineQuit( + __in BAENGINE_QUIT_ARGS* pArgs, + __in BAENGINE_QUIT_RESULTS* pResults ); static HRESULT WINAPI EngineProc( @@ -39,6 +63,10 @@ private: __in_opt LPVOID pvContext ); + HRESULT ProcessBAMessage( + __in const MSG* pmsg + ); + public: TestEngine(); @@ -47,4 +75,5 @@ public: private: HMODULE m_hBAModule; BOOTSTRAPPER_CREATE_RESULTS* m_pCreateResults; + DWORD m_dwThreadId; }; \ No newline at end of file diff --git a/src/test/examples/TestEngine/WaitForQuitEngine.cpp b/src/test/examples/TestEngine/WaitForQuitEngine.cpp new file mode 100644 index 00000000..2f80ba75 --- /dev/null +++ b/src/test/examples/TestEngine/WaitForQuitEngine.cpp @@ -0,0 +1,35 @@ +// 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. + +#include "precomp.h" + +HRESULT RunWaitForQuitEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ) +{ + HRESULT hr = S_OK; + TestEngine* pTestEngine = NULL; + + pTestEngine = new TestEngine(); + ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); + + hr = pTestEngine->Initialize(wzBundleFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine."); + + hr = pTestEngine->LoadBA(wzBAFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); + + hr = pTestEngine->SendStartupEvent(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + + hr = pTestEngine->RunApplication(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); + + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); + + pTestEngine->UnloadBA(); + +LExit: + return hr; +} diff --git a/src/test/examples/TestEngine/WaitForQuitEngine.h b/src/test/examples/TestEngine/WaitForQuitEngine.h new file mode 100644 index 00000000..99e3f63c --- /dev/null +++ b/src/test/examples/TestEngine/WaitForQuitEngine.h @@ -0,0 +1,8 @@ +#pragma once +// 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. + + +HRESULT RunWaitForQuitEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ); diff --git a/src/test/examples/TestEngine/precomp.h b/src/test/examples/TestEngine/precomp.h index 3fbc7e90..f943f420 100644 --- a/src/test/examples/TestEngine/precomp.h +++ b/src/test/examples/TestEngine/precomp.h @@ -17,3 +17,4 @@ #include "TestEngine.h" #include "ReloadEngine.h" #include "ShutdownEngine.h" +#include "WaitForQuitEngine.h" diff --git a/src/test/examples/WPFCoreMBA/AssemblyInfo.cs b/src/test/examples/WPFCoreMBA/AssemblyInfo.cs new file mode 100644 index 00000000..03a5c7fa --- /dev/null +++ b/src/test/examples/WPFCoreMBA/AssemblyInfo.cs @@ -0,0 +1,12 @@ +// 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. + +using System.Windows; + +[assembly:ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj new file mode 100644 index 00000000..3b559f9b --- /dev/null +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp3.1 + win-x86;win-x64 + true + WPF .NET Core MBA + true + + + + + + + + \ No newline at end of file diff --git a/src/test/examples/WPFCoreMBA/MainWindow.xaml b/src/test/examples/WPFCoreMBA/MainWindow.xaml new file mode 100644 index 00000000..40a27a06 --- /dev/null +++ b/src/test/examples/WPFCoreMBA/MainWindow.xaml @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/src/test/examples/WPFCoreMBA/MainWindow.xaml.cs b/src/test/examples/WPFCoreMBA/MainWindow.xaml.cs new file mode 100644 index 00000000..4f61b807 --- /dev/null +++ b/src/test/examples/WPFCoreMBA/MainWindow.xaml.cs @@ -0,0 +1,17 @@ +// 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. + +namespace Example.WPFCoreMBA +{ + using System.Windows; + + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + this.InitializeComponent(); + } + } +} diff --git a/src/test/examples/WPFCoreMBA/WPFCoreBA.cs b/src/test/examples/WPFCoreMBA/WPFCoreBA.cs new file mode 100644 index 00000000..d50be813 --- /dev/null +++ b/src/test/examples/WPFCoreMBA/WPFCoreBA.cs @@ -0,0 +1,42 @@ +// 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. + +namespace Example.WPFCoreMBA +{ + using System.Windows.Threading; + using WixToolset.Mba.Core; + + public class WPFCoreBA : BootstrapperApplication + { + public WPFCoreBA(IEngine engine) + : base(engine) + { + } + + public Dispatcher BADispatcher { get; private set; } + + protected override void Run() + { + this.BADispatcher = Dispatcher.CurrentDispatcher; + var window = new MainWindow(); + window.Closed += (s, e) => this.BADispatcher.InvokeShutdown(); + //window.Show(); + //Dispatcher.Run(); + //this.engine.Quit(0); + } + + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(WPFCoreBA)); + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs b/src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs new file mode 100644 index 00000000..a3ccdf9f --- /dev/null +++ b/src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs @@ -0,0 +1,22 @@ +// 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. + +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.WPFCoreMBA.WPFCoreBAFactory))] +namespace Example.WPFCoreMBA +{ + using WixToolset.Mba.Core; + + public class WPFCoreBAFactory : BaseBootstrapperApplicationFactory + { + private static int loadCount = 0; + + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; + return new WPFCoreBA(engine); + } + } +} -- cgit v1.2.3-55-g6feb From f5bb3cb1a730f9d3c2cbd5b3ab136354a8420c54 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 15 May 2020 09:36:40 +1000 Subject: Update to latest tools. --- src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 2 -- src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs | 2 +- src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 1 - src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs | 10 ---------- src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs | 4 ---- .../TestData/EarliestCoreMBA/HarvestedSCD.wxs | 2 +- .../TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs | 2 +- .../TestData/LatestCoreMBA/HarvestedSCD.wxs | 2 +- .../TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs | 2 +- src/test/WixToolsetTest.ManagedHost/TestEngine.cs | 1 - .../WixToolsetTest.ManagedHost.csproj | 1 - src/wixlib/bal.wixproj | 4 ++-- src/wixlib/packages.config | 2 +- 13 files changed, 8 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 97ac68a7..18b4727f 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -26,7 +26,6 @@ namespace WixToolsetTest.Bal Path.Combine(bundleSourceFolder, "Bundle.wxs"), "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, - "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -52,7 +51,6 @@ namespace WixToolsetTest.Bal "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), "-intermediateFolder", intermediateFolder, - "-burnStub", TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"), "-o", bundleFile, }); Assert.Equal(6802, compileResult.ExitCode); diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs index 45bb25d1..82b0434d 100644 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs @@ -6,7 +6,7 @@ - + diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 19c86839..f970c2c8 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -25,7 +25,6 @@ - diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs index f33709ab..a2a9a107 100644 --- a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs @@ -28,7 +28,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -63,7 +62,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -98,7 +96,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -133,7 +130,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -172,7 +168,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -206,7 +201,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -246,7 +240,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -281,7 +274,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -316,7 +308,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -355,7 +346,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs index 8b0a3691..45b3e9d0 100644 --- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs @@ -29,7 +29,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -64,7 +63,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -99,7 +97,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); @@ -138,7 +135,6 @@ namespace WixToolsetTest.ManagedHost "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-bindpath", baSourceFolder, - "-burnStub", TestEngine.BurnStubFile, "-o", bundleFile, }); compileResult.AssertSuccess(); diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs index bb8d56aa..6699b094 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs @@ -63,7 +63,7 @@ - + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs index 336eef4c..7eb56061 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs @@ -59,7 +59,7 @@ - + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs index 09433669..35373631 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs @@ -63,7 +63,7 @@ - + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs index 58ba7b39..9076d2e6 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs @@ -59,7 +59,7 @@ - + diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs index cda32895..44538227 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs +++ b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs @@ -11,7 +11,6 @@ namespace WixToolsetTest.ManagedHost public class TestEngine { private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); - public static readonly string BurnStubFile = TestData.Get(@"runtimes\win-x86\native\burn.x86.exe"); public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) { diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index ff472322..d446d3a1 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -63,7 +63,6 @@ - diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index a158cd81..23b52788 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,7 +1,7 @@ - + {3444D952-F21C-496F-AB6B-56435BFD0787} @@ -57,7 +57,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}. - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 1e5a9850..9190b5d0 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file -- cgit v1.2.3-55-g6feb 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. --- src/Samples/bafunctions/bafunctions.vcxproj | 12 +- src/Samples/bafunctions/packages.config | 6 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 12 +- src/dnchost/packages.config | 6 +- src/mbahost/mbahost.vcxproj | 12 +- src/mbahost/packages.config | 6 +- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../Example.FullFramework2MBA.csproj | 6 +- .../examples/FullFramework2MBA/packages.config | 2 +- .../Example.FullFramework4MBA.csproj | 2 +- .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 12 +- src/test/examples/TestEngine/TestEngine.cpp | 4 +- src/test/examples/TestEngine/packages.config | 6 +- .../examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 4 +- .../WixStandardBootstrapperApplication.cpp | 232 ++++++++++----------- src/wixstdba/packages.config | 6 +- src/wixstdba/wixstdba.mc | 7 + src/wixstdba/wixstdba.vcxproj | 12 +- 21 files changed, 178 insertions(+), 177 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 9f2181f2..d4de1461 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -57,9 +57,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 23b191d4..1b4c9487 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 65467acc..579284f5 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -44,7 +44,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 diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 10ce3830..0565784e 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index e2b8b529..f61c084e 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -69,9 +69,9 @@ 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/dnchost/packages.config b/src/dnchost/packages.config index c8911ea5..fdcf876c 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -2,7 +2,7 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index fbcc9094..037adc99 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -68,9 +68,9 @@ 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/mbahost/packages.config b/src/mbahost/packages.config index 23b191d4..1b4c9487 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file 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 diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 826c4386..69913de2 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -146,13 +146,13 @@ static THEME_ASSIGN_CONTROL_ID vrgInitControls[] = { { WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, L"FailureRestartButton" }, }; -typedef struct _WIXSTDBA_PREREQ_PACKAGE +typedef struct _WIXSTDBA_PACKAGE_INFO { LPWSTR sczPackageId; BOOL fWasAlreadyInstalled; BOOL fPlannedToBeInstalled; BOOL fSuccessfullyInstalled; -} WIXSTDBA_PREREQ_PACKAGE; +} WIXSTDBA_PACKAGE_INFO; static HRESULT DAPI EvaluateVariableConditionCallback( @@ -268,7 +268,11 @@ public: // IBootstrapperApplication __inout BOOL* pfCancel ) { - BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine); + BAL_INFO_PACKAGE* pPackage = NULL; + if (SUCCEEDED(BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine, &pPackage))) + { + InitializePackageInfoForPackage(pPackage); + } // If we're not doing a prerequisite install, remember when our bundle would cause a downgrade. if (!m_fPrereq && BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE == operation) @@ -286,13 +290,15 @@ public: // IBootstrapperApplication __in BOOTSTRAPPER_PACKAGE_STATE state ) { - WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; BAL_INFO_PACKAGE* pPackage = NULL; - HRESULT hr = GetPrereqPackage(wzPackageId, &pPrereqPackage, &pPackage); - if (SUCCEEDED(hr) && BOOTSTRAPPER_PACKAGE_STATE_PRESENT == state) + + if (BOOTSTRAPPER_PACKAGE_STATE_PRESENT == state && + SUCCEEDED(GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage)) && + pPackageInfo) { - // If the prerequisite package is already installed, remember that. - pPrereqPackage->fWasAlreadyInstalled = TRUE; + // If the package is already installed, remember that. + pPackageInfo->fWasAlreadyInstalled = TRUE; } return S_OK; @@ -314,9 +320,11 @@ public: // IBootstrapperApplication m_fPrereqAlreadyInstalled = TRUE; // At this point we have to assume that all prerequisite packages need to be installed, so set to false if any of them aren't installed. - for (DWORD i = 0; i < m_cPrereqPackages; ++i) + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) { - if (m_rgPrereqPackages[i].sczPackageId && !m_rgPrereqPackages[i].fWasAlreadyInstalled) + BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i]; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast(pPackage->pvCustomData); + if (pPackage->fPrereqPackage && pPackageInfo && !pPackageInfo->fWasAlreadyInstalled) { m_fPrereqAlreadyInstalled = FALSE; break; @@ -384,17 +392,17 @@ public: // IBootstrapperApplication ) { HRESULT hr = S_OK; - WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; BAL_INFO_PACKAGE* pPackage = NULL; // If we're planning to install a prerequisite, install it. The prerequisite needs to be installed // in all cases (even uninstall!) so the BA can load next. if (m_fPrereq) { - // Only install prerequisite packages, and check the InstallCondition on prerequisite support packages. + // Only install prerequisite packages, and check the InstallCondition on them. BOOL fInstall = FALSE; - hr = GetPrereqPackage(wzPackageId, &pPrereqPackage, &pPackage); - if (SUCCEEDED(hr) && pPackage) + hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); + if (SUCCEEDED(hr) && pPackage->fPrereqPackage && pPackageInfo) { if (pPackage->sczInstallCondition && *pPackage->sczInstallCondition) { @@ -410,7 +418,7 @@ public: // IBootstrapperApplication fInstall = TRUE; } - pPrereqPackage->fPlannedToBeInstalled = fInstall; + pPackageInfo->fPlannedToBeInstalled = fInstall; } if (fInstall) @@ -459,9 +467,11 @@ public: // IBootstrapperApplication m_fPrereqAlreadyInstalled = TRUE; // Now that we've planned the packages, we can focus on the prerequisite packages that are supposed to be installed. - for (DWORD i = 0; i < m_cPrereqPackages; ++i) + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) { - if (m_rgPrereqPackages[i].sczPackageId && !m_rgPrereqPackages[i].fWasAlreadyInstalled && m_rgPrereqPackages[i].fPlannedToBeInstalled) + BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i]; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast(pPackage->pvCustomData); + if (pPackage->fPrereqPackage && pPackageInfo && !pPackageInfo->fWasAlreadyInstalled && pPackageInfo->fPlannedToBeInstalled) { m_fPrereqAlreadyInstalled = FALSE; break; @@ -706,6 +716,8 @@ public: // IBootstrapperApplication __in_z LPCWSTR wzPackageId, __in BOOL fExecute, __in BOOTSTRAPPER_ACTION_STATE action, + __in INSTALLUILEVEL uiLevel, + __in BOOL fDisableExternalUiHandler, __inout BOOL* pfCancel ) { @@ -750,12 +762,7 @@ public: // IBootstrapperApplication wz = sczFormattedString ? sczFormattedString : pPackage->sczDisplayName ? pPackage->sczDisplayName : wzPackageId; } - // Needs to match MsiEngineCalculateInstallUiLevel in msiengine.cpp in Burn. - fShowingInternalUiThisPackage = pPackage && pPackage->fDisplayInternalUI && - BOOTSTRAPPER_ACTION_STATE_UNINSTALL != action && - BOOTSTRAPPER_ACTION_STATE_REPAIR != action && - (BOOTSTRAPPER_DISPLAY_FULL == m_command.display || - BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display); + fShowingInternalUiThisPackage = INSTALLUILEVEL_NONE != (INSTALLUILEVEL_NONE & uiLevel); ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz); ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); @@ -763,7 +770,7 @@ public: // IBootstrapperApplication ::EnterCriticalSection(&m_csShowingInternalUiThisPackage); m_fShowingInternalUiThisPackage = fShowingInternalUiThisPackage; - hr = __super::OnExecutePackageBegin(wzPackageId, fExecute, action, pfCancel); + hr = __super::OnExecutePackageBegin(wzPackageId, fExecute, action, uiLevel, fDisableExternalUiHandler, pfCancel); ::LeaveCriticalSection(&m_csShowingInternalUiThisPackage); ReleaseStr(sczFormattedString); @@ -811,16 +818,16 @@ public: // IBootstrapperApplication hr = __super::OnExecutePackageComplete(wzPackageId, hrStatus, restart, recommendation, pAction); - WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; BAL_INFO_PACKAGE* pPackage; - HRESULT hrPrereq = GetPrereqPackage(wzPackageId, &pPrereqPackage, &pPackage); - if (SUCCEEDED(hrPrereq)) + HRESULT hrPrereq = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); + if (SUCCEEDED(hrPrereq) && pPackageInfo) { - pPrereqPackage->fSuccessfullyInstalled = SUCCEEDED(hrStatus); + pPackageInfo->fSuccessfullyInstalled = SUCCEEDED(hrStatus); // If the prerequisite required a restart (any restart) then do an immediate // restart to ensure that the bundle will get launched again post reboot. - if (BOOTSTRAPPER_APPLY_RESTART_NONE != restart) + if (m_fPrereq && pPackage->fPrereqPackage && BOOTSTRAPPER_APPLY_RESTART_NONE != restart) { *pAction = BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION_RESTART; } @@ -931,11 +938,13 @@ public: // IBootstrapperApplication m_fPrereqInstalled = TRUE; BOOL fInstalledAPackage = FALSE; - for (DWORD i = 0; i < m_cPrereqPackages; ++i) + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) { - if (m_rgPrereqPackages[i].sczPackageId && m_rgPrereqPackages[i].fPlannedToBeInstalled && !m_rgPrereqPackages[i].fWasAlreadyInstalled) + BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i]; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast(pPackage->pvCustomData); + if (pPackage->fPrereqPackage && pPackageInfo && pPackageInfo->fPlannedToBeInstalled && !pPackageInfo->fWasAlreadyInstalled) { - if (m_rgPrereqPackages[i].fSuccessfullyInstalled) + if (pPackageInfo->fSuccessfullyInstalled) { fInstalledAPackage = TRUE; } @@ -1164,6 +1173,9 @@ public: // IBootstrapperApplication case BOOTSTRAPPER_APPLICATION_MESSAGE_ONLAUNCHAPPROVEDEXECOMPLETE: OnLaunchApprovedExeCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIPACKAGE: + OnPlanMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; default: BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message); m_pfnBAFunctionsProc((BA_FUNCTIONS_MESSAGE)message, pvArgs, pvResults, m_pvBAFunctionsProcContext); @@ -1617,6 +1629,18 @@ private: // privates m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONLAUNCHAPPROVEDEXECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); } + void OnPlanMsiPackageFallback( + __in BA_ONPLANMSIPACKAGE_ARGS* pArgs, + __inout BA_ONPLANMSIPACKAGE_RESULTS* pResults + ) + { + BURN_MSI_PROPERTY actionMsiProperty = pResults->actionMsiProperty; + INSTALLUILEVEL uiLevel = pResults->uiLevel; + BOOL fDisableExternalUiHandler = pResults->fDisableExternalUiHandler; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, actionMsiProperty, uiLevel, fDisableExternalUiHandler ? "yes" : "no", pResults->actionMsiProperty, pResults->uiLevel, pResults->fDisableExternalUiHandler ? "yes" : "no"); + } + // // UiThreadProc - entrypoint for UI thread. // @@ -1752,10 +1776,13 @@ private: // privates GetBundleFileVersion(); // don't fail if we couldn't get the version info; best-effort only + hr = InitializePackageInfo(); + BalExitOnFailure(hr, "Failed to initialize wixstdba package information."); + if (m_fPrereq) { - hr = ParsePrerequisiteInformationFromXml(pixdManifest); - BalExitOnFailure(hr, "Failed to read prerequisite information."); + hr = InitializePrerequisiteInformation(); + BalExitOnFailure(hr, "Failed to initialize prerequisite information."); } else { @@ -1982,100 +2009,77 @@ private: // privates } - HRESULT ParsePrerequisiteInformationFromXml( - __in IXMLDOMDocument* pixdManifest - ) + HRESULT InitializePackageInfo() { HRESULT hr = S_OK; - IXMLDOMNode* pNode = NULL; - IXMLDOMNodeList* pNodes = NULL; - DWORD cNodes = 0; - LPWSTR scz = NULL; - WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; BAL_INFO_PACKAGE* pPackage = NULL; - hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixMbaPrereqInformation", &pNodes); - if (S_FALSE == hr) + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) { - hr = E_INVALIDARG; - BalExitOnFailure(hr, "BootstrapperApplication.xml manifest is missing prerequisite information."); - } - BalExitOnFailure(hr, "Failed to select prerequisite information nodes."); + pPackage = &m_Bundle.packages.rgPackages[i]; - hr = pNodes->get_length((long*)&cNodes); - BalExitOnFailure(hr, "Failed to get prerequisite information node count."); + hr = InitializePackageInfoForPackage(pPackage); + BalExitOnFailure(hr, "Failed to initialize wixstdba package info for package: %ls.", pPackage->sczId); + } - m_cPrereqPackages = cNodes; - m_rgPrereqPackages = static_cast(MemAlloc(sizeof(WIXSTDBA_PREREQ_PACKAGE) * m_cPrereqPackages, TRUE)); + LExit: + return hr; + } - hr = DictCreateWithEmbeddedKey(&m_shPrereqSupportPackages, m_cPrereqPackages, reinterpret_cast(&m_rgPrereqPackages), offsetof(WIXSTDBA_PREREQ_PACKAGE, sczPackageId), DICT_FLAG_NONE); - BalExitOnFailure(hr, "Failed to create the prerequisite package dictionary."); - for (DWORD i = 0; i < cNodes; ++i) - { - hr = XmlNextElement(pNodes, &pNode, NULL); - BalExitOnFailure(hr, "Failed to get next node."); + HRESULT InitializePackageInfoForPackage( + __in BAL_INFO_PACKAGE* pPackage + ) + { + HRESULT hr = S_OK; - hr = XmlGetAttributeEx(pNode, L"PackageId", &scz); - BalExitOnFailure(hr, "Failed to get @PackageId."); + pPackage->pvCustomData = MemAlloc(sizeof(WIXSTDBA_PACKAGE_INFO), TRUE); + BalExitOnNull(pPackage->pvCustomData, hr, E_OUTOFMEMORY, "Failed to allocate memory for wixstdba package info."); - hr = DictGetValue(m_shPrereqSupportPackages, scz, reinterpret_cast(&pPrereqPackage)); - if (SUCCEEDED(hr)) - { - hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); - BalExitOnFailure(hr, "Duplicate prerequisite information: %ls", scz); - } - else if (E_NOTFOUND != hr) - { - BalExitOnFailure(hr, "Failed to check if \"%ls\" was in the prerequisite package dictionary.", scz); - } + LExit: + return hr; + } - hr = BalInfoFindPackageById(&m_Bundle.packages, scz, &pPackage); - BalExitOnFailure(hr, "Failed to get info about \"%ls\" from BootstrapperApplicationData.", scz); - pPrereqPackage = &m_rgPrereqPackages[i]; - pPrereqPackage->sczPackageId = pPackage->sczId; - hr = DictAddValue(m_shPrereqSupportPackages, pPrereqPackage); - BalExitOnFailure(hr, "Failed to add \"%ls\" to the prerequisite package dictionary.", pPrereqPackage->sczPackageId); + HRESULT InitializePrerequisiteInformation() + { + HRESULT hr = S_OK; + BAL_INFO_PACKAGE* pPackage = NULL; - hr = XmlGetAttributeEx(pNode, L"LicenseFile", &scz); - if (E_NOTFOUND != hr) + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) + { + pPackage = &m_Bundle.packages.rgPackages[i]; + if (!pPackage->fPrereqPackage) { - BalExitOnFailure(hr, "Failed to get @LicenseFile."); + continue; + } + if (pPackage->sczPrereqLicenseFile) + { if (m_sczLicenseFile) { hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); BalExitOnFailure(hr, "More than one license file specified in prerequisite info."); } - m_sczLicenseFile = scz; - scz = NULL; + hr = StrAllocString(&m_sczLicenseFile, pPackage->sczPrereqLicenseFile, 0); + BalExitOnFailure(hr, "Failed to copy license file location from prereq package."); } - hr = XmlGetAttributeEx(pNode, L"LicenseUrl", &scz); - if (E_NOTFOUND != hr) + if (pPackage->sczPrereqLicenseUrl) { - BalExitOnFailure(hr, "Failed to get @LicenseUrl."); - if (m_sczLicenseUrl) { hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); BalExitOnFailure(hr, "More than one license URL specified in prerequisite info."); } - m_sczLicenseUrl = scz; - scz = NULL; + hr = StrAllocString(&m_sczLicenseUrl, pPackage->sczPrereqLicenseUrl, 0); + BalExitOnFailure(hr, "Failed to copy license URL from prereq package."); } - - // Prepare next iteration. - ReleaseNullObject(pNode); } LExit: - ReleaseObject(pNode); - ReleaseObject(pNodes); - ReleaseStr(scz); return hr; } @@ -2182,37 +2186,31 @@ private: // privates return hr; } - HRESULT GetPrereqPackage( + HRESULT GetPackageInfo( __in_z LPCWSTR wzPackageId, - __out WIXSTDBA_PREREQ_PACKAGE** ppPrereqPackage, + __out WIXSTDBA_PACKAGE_INFO** ppPackageInfo, __out BAL_INFO_PACKAGE** ppPackage ) { HRESULT hr = E_NOTFOUND; - WIXSTDBA_PREREQ_PACKAGE* pPrereqPackage = NULL; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; BAL_INFO_PACKAGE* pPackage = NULL; Assert(wzPackageId && *wzPackageId); Assert(ppPackage); - Assert(ppPrereqPackage); + Assert(ppPackageInfo); - if (m_shPrereqSupportPackages) + hr = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); + if (E_NOTFOUND != hr) { - hr = DictGetValue(m_shPrereqSupportPackages, wzPackageId, reinterpret_cast(&pPrereqPackage)); - if (E_NOTFOUND != hr) - { - ExitOnFailure(hr, "Failed to check the dictionary of prerequisite packages."); + ExitOnFailure(hr, "Failed trying to find the requested package."); - // Ignore error. - BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); - } + pPackageInfo = reinterpret_cast(pPackage->pvCustomData); } - if (pPrereqPackage) - { - *ppPrereqPackage = pPrereqPackage; - *ppPackage = pPackage; - } + *ppPackageInfo = pPackageInfo; + *ppPackage = pPackage; + LExit: return hr; } @@ -3636,9 +3634,6 @@ public: m_fSupportCacheOnly = FALSE; m_sdOverridableVariables = NULL; - m_shPrereqSupportPackages = NULL; - m_rgPrereqPackages = NULL; - m_cPrereqPackages = 0; m_pTaskbarList = NULL; m_uTaskbarButtonCreatedMessage = UINT_MAX; m_fTaskbarButtonOK = FALSE; @@ -3667,11 +3662,14 @@ public: AssertSz(!::IsWindow(m_hWnd), "Window should have been destroyed before destructor."); AssertSz(!m_pTheme, "Theme should have been released before destructor."); + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) + { + ReleaseMem(m_Bundle.packages.rgPackages[i].pvCustomData); + } + ::DeleteCriticalSection(&m_csShowingInternalUiThisPackage); ReleaseObject(m_pTaskbarList); ReleaseDict(m_sdOverridableVariables); - ReleaseDict(m_shPrereqSupportPackages); - ReleaseMem(m_rgPrereqPackages); ReleaseStr(m_sczFailedMessage); ReleaseStr(m_sczConfirmCloseMessage); BalConditionsUninitialize(&m_Conditions); @@ -3739,10 +3737,6 @@ private: STRINGDICT_HANDLE m_sdOverridableVariables; - WIXSTDBA_PREREQ_PACKAGE* m_rgPrereqPackages; - DWORD m_cPrereqPackages; - STRINGDICT_HANDLE m_shPrereqSupportPackages; - BOOL m_fPrereq; BOOL m_fPrereqInstalled; BOOL m_fPrereqAlreadyInstalled; diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 23b191d4..1b4c9487 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.mc b/src/wixstdba/wixstdba.mc index 66aa9767..34f8f844 100644 --- a/src/wixstdba/wixstdba.mc +++ b/src/wixstdba/wixstdba.mc @@ -71,3 +71,10 @@ Language=English WIXSTDBA: Planned MSI feature: %2!ls! for %1!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs! . +MessageId=7 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_MSI_PACKAGE +Language=English +WIXSTDBA: Planned MSI package: %1!ls!, wixstdba requested: actionMsiProperty=%2!d!;uiLevel=%3!d!;disableExternalUiHandler=%4!hs!, bafunctions requested: actionMsiProperty=%5!d!;uiLevel=%6!d!;disableExternalUiHandler=%7!hs! +. + diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index ab15c62f..e97c4692 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -107,9 +107,9 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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}. - - - + + + -- cgit v1.2.3-55-g6feb From abfe02f2e31480f2cfb72b3daa641d7e723448d9 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 16 May 2020 21:53:44 +1000 Subject: WIXFEAT:6164 Implement DisplayInternalUICondition. --- src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 35 +++++++++++++ .../TestData/WixStdBa/Data/test.msi | Bin 0 -> 32768 bytes .../WixStdBa/DisplayInternalUIConditionBundle.wxs | 12 +++++ .../WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 2 + src/wixext/BalCompiler.cs | 17 +++++++ src/wixext/Tuples/BalTupleDefinitions.cs | 5 ++ src/wixext/Tuples/WixBalPackageInfoTuple.cs | 55 +++++++++++++++++++++ src/wixext/bal.xsd | 15 ++++++ .../WixStandardBootstrapperApplication.cpp | 47 ++++++++++++++++++ 9 files changed, 188 insertions(+) create mode 100644 src/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi create mode 100644 src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs create mode 100644 src/wixext/Tuples/WixBalPackageInfoTuple.cs (limited to 'src') diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 18b4727f..5780ca08 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -4,12 +4,47 @@ namespace WixToolsetTest.Bal { using System.IO; using System.Linq; + using System.Xml; using WixBuildTools.TestSupport; using WixToolset.Core.TestPackage; using Xunit; public class BalExtensionFixture { + [Fact] + public void CanBuildUsingDisplayInternalUICondition() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "DisplayInternalUIConditionBundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", Path.Combine(bundleSourceFolder, "data"), + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balPackageInfos = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); + var balPackageInfo = (XmlNode)Assert.Single(balPackageInfos); + Assert.Equal("", balPackageInfo.GetTestXml()); + } + } + [Fact] public void CanBuildUsingWixStdBa() { diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi new file mode 100644 index 00000000..94aacd1a Binary files /dev/null and b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi differ diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs new file mode 100644 index 00000000..438fc23e --- /dev/null +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index f970c2c8..f09a19a2 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -14,6 +14,8 @@ + + diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index dfe29bde..03b74e57 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -104,6 +104,23 @@ namespace WixToolset.Bal { switch (attribute.Name.LocalName) { + case "DisplayInternalUICondition": + switch (parentElement.Name.LocalName) + { + case "MsiPackage": + case "MspPackage": + var displayInternalUICondition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); + section.AddTuple(new WixBalPackageInfoTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, packageId)) + { + PackageId = packageId, + DisplayInternalUICondition = displayInternalUICondition, + }); + break; + default: + this.ParseHelper.UnexpectedAttribute(parentElement, attribute); + break; + } + break; case "PrereqLicenseFile": if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) diff --git a/src/wixext/Tuples/BalTupleDefinitions.cs b/src/wixext/Tuples/BalTupleDefinitions.cs index 9a294703..08e7ba2a 100644 --- a/src/wixext/Tuples/BalTupleDefinitions.cs +++ b/src/wixext/Tuples/BalTupleDefinitions.cs @@ -11,6 +11,7 @@ namespace WixToolset.Bal WixBalBAFactoryAssembly, WixBalBAFunctions, WixBalCondition, + WixBalPackageInfo, WixDncOptions, WixMbaPrereqInformation, WixStdbaOptions, @@ -44,6 +45,9 @@ namespace WixToolset.Bal case BalTupleDefinitionType.WixBalCondition: return BalTupleDefinitions.WixBalCondition; + case BalTupleDefinitionType.WixBalPackageInfo: + return BalTupleDefinitions.WixBalPackageInfo; + case BalTupleDefinitionType.WixDncOptions: return BalTupleDefinitions.WixDncOptions; @@ -66,6 +70,7 @@ namespace WixToolset.Bal WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); diff --git a/src/wixext/Tuples/WixBalPackageInfoTuple.cs b/src/wixext/Tuples/WixBalPackageInfoTuple.cs new file mode 100644 index 00000000..32be3105 --- /dev/null +++ b/src/wixext/Tuples/WixBalPackageInfoTuple.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Tuples; + + public static partial class BalTupleDefinitions + { + public static readonly IntermediateTupleDefinition WixBalPackageInfo = new IntermediateTupleDefinition( + BalTupleDefinitionType.WixBalPackageInfo.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.DisplayInternalUICondition), IntermediateFieldType.String), + }, + typeof(WixBalPackageInfoTuple)); + } +} + +namespace WixToolset.Bal.Tuples +{ + using WixToolset.Data; + + public enum WixBalPackageInfoTupleFields + { + PackageId, + DisplayInternalUICondition, + } + + public class WixBalPackageInfoTuple : IntermediateTuple + { + public WixBalPackageInfoTuple() : base(BalTupleDefinitions.WixBalPackageInfo, null, null) + { + } + + public WixBalPackageInfoTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalPackageInfo, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalPackageInfoTupleFields index] => this.Fields[(int)index]; + + public string PackageId + { + get => this.Fields[(int)WixBalPackageInfoTupleFields.PackageId].AsString(); + set => this.Set((int)WixBalPackageInfoTupleFields.PackageId, value); + } + + public string DisplayInternalUICondition + { + get => this.Fields[(int)WixBalPackageInfoTupleFields.DisplayInternalUICondition].AsString(); + set => this.Set((int)WixBalPackageInfoTupleFields.DisplayInternalUICondition, value); + } + } +} diff --git a/src/wixext/bal.xsd b/src/wixext/bal.xsd index ee1f8cec..1bec2873 100644 --- a/src/wixext/bal.xsd +++ b/src/wixext/bal.xsd @@ -277,6 +277,21 @@ + + + + Specifies whether the bundle will show the UI authored into the msi package. If not specified or the condition evaluates + to false, all information is routed to the bootstrapper application to provide a unified installation experience. + Otherwise, the UI authored into the msi package will be displayed on top of any bootstrapper application UI. + WixStdBA doesn't support EmbeddedUI. + + + + + + + + diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 69913de2..dd7ad229 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -456,6 +456,53 @@ public: // IBootstrapperApplication } + virtual STDMETHODIMP OnPlanMsiPackage( + __in_z LPCWSTR wzPackageId, + __in BOOL fExecute, + __in BOOTSTRAPPER_ACTION_STATE action, + __inout BOOL* pfCancel, + __inout BURN_MSI_PROPERTY* pActionMsiProperty, + __inout INSTALLUILEVEL* pUiLevel, + __inout BOOL* pfDisableExternalUiHandler + ) + { + HRESULT hr = S_OK; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; + BAL_INFO_PACKAGE* pPackage = NULL; + BOOL fShowInternalUI = FALSE; + INSTALLUILEVEL uiLevel = INSTALLUILEVEL_NOCHANGE; + + switch (m_command.display) + { + case BOOTSTRAPPER_DISPLAY_FULL: + uiLevel = INSTALLUILEVEL_FULL; + break; + + case BOOTSTRAPPER_DISPLAY_PASSIVE: + uiLevel = INSTALLUILEVEL_REDUCED; + break; + } + + if (INSTALLUILEVEL_NOCHANGE != uiLevel) + { + hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); + if (SUCCEEDED(hr) && pPackage->sczDisplayInternalUICondition) + { + hr = BalEvaluateCondition(pPackage->sczDisplayInternalUICondition, &fShowInternalUI); + BalExitOnFailure(hr, "Failed to evaluate condition for package '%ls': %ls", wzPackageId, pPackage->sczDisplayInternalUICondition); + + if (fShowInternalUI) + { + *pUiLevel = uiLevel; + } + } + } + + LExit: + return __super::OnPlanMsiPackage(wzPackageId, fExecute, action, pfCancel, pActionMsiProperty, pUiLevel, pfDisableExternalUiHandler); + } + + virtual STDMETHODIMP OnPlanComplete( __in HRESULT hrStatus ) -- cgit v1.2.3-55-g6feb From 864d9ef13f33ded262a593c0c66e2463aef7a38a Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sun, 7 Jun 2020 22:49:35 -0400 Subject: Update to latest tools --- appveyor.cmd | 3 +++ src/wixlib/bal.wixproj | 14 +++++++------- src/wixlib/packages.config | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index d3acaadb..e270866d 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -10,5 +10,8 @@ msbuild -p:Configuration=Release msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Bal.wixext.csproj msbuild -p:Configuration=Release -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj +msbuild -p:Configuration=Release src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj +dotnet test -c Release --no-build src\test\WixToolsetTest.Bal + @popd @endlocal \ No newline at end of file diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 23b52788..c7c9a5c3 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,8 +1,9 @@ - - + + + {3444D952-F21C-496F-AB6B-56435BFD0787} bal @@ -47,17 +48,16 @@ {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} + - - - - + 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}. - + + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 9190b5d0..6e79c4c9 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From d141190ab6dae5afeecb515e59e82fae1b580e48 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Mon, 8 Jun 2020 09:11:35 -0400 Subject: Fix a couple of many warnings. --- src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | 3 +-- src/wixlib/bal.wixproj | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec index 101a6671..d1633cb0 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec @@ -5,8 +5,7 @@ $version$ WiX Toolset Team WiX Toolset Team - - https://licenses.nuget.org/MS-RL + MS-RL https://github.com/wixtoolset/Bal.wixext false $description$ diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index c7c9a5c3..45ca7f88 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,9 +1,8 @@ - - + + - {3444D952-F21C-496F-AB6B-56435BFD0787} bal @@ -48,16 +47,17 @@ {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} - - + + + + 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}. - + - -- cgit v1.2.3-55-g6feb From e4f1a4310f09e3777d035f35f4b4ca69d69f5083 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 22 Jun 2020 14:34:24 +1000 Subject: Update dependencies. --- appveyor.cmd | 15 +++--- src/Samples/bafunctions/bafunctions.vcxproj | 8 +-- src/Samples/bafunctions/packages.config | 4 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 8 +-- src/dnchost/packages.config | 4 +- src/mbahost/mbahost.vcxproj | 8 +-- src/mbahost/packages.config | 4 +- .../TestData/FullFramework2MBA/Bundle.wxs | 8 +-- .../TestData/FullFramework4MBA/Bundle.wxs | 8 +-- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../Example.FullFramework2MBA.csproj | 50 +++---------------- .../FullFramework2MBA/FullFramework2BAFactory.cs | 1 + .../FullFramework2MBA/Properties/AssemblyInfo.cs | 18 ------- .../examples/FullFramework2MBA/packages.config | 4 -- .../Example.FullFramework4MBA.csproj | 3 +- .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 8 +-- src/test/examples/TestEngine/packages.config | 4 +- .../examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/wixext/BalBurnBackendExtension.cs | 15 ++++++ src/wixlib/bal.wixproj | 4 +- src/wixlib/packages.config | 2 +- src/wixlib/wixstdba.wxs | 58 +++++++++++----------- src/wixstdba/packages.config | 4 +- src/wixstdba/wixstdba.vcxproj | 10 ++-- 27 files changed, 109 insertions(+), 149 deletions(-) delete mode 100644 src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs delete mode 100644 src/test/examples/FullFramework2MBA/packages.config (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index e270866d..295607cb 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -1,17 +1,18 @@ @setlocal @pushd %~dp0 +@set _C=Release -nuget restore +nuget restore || exit /b -msbuild -p:Configuration=Release -t:Restore +msbuild -p:Configuration=%_C% -t:Restore || exit /b -msbuild -p:Configuration=Release +msbuild -p:Configuration=%_C% || exit /b -msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Bal.wixext.csproj -msbuild -p:Configuration=Release -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj +msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b +msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b -msbuild -p:Configuration=Release src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj -dotnet test -c Release --no-build src\test\WixToolsetTest.Bal +msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj || exit /b +dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b @popd @endlocal \ No newline at end of file diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index d4de1461..92637507 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -57,9 +57,9 @@ 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}. - + - + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 1b4c9487..7cbb7bbe 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -2,6 +2,6 @@ - - + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 579284f5..2c912f3d 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -44,7 +44,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.22\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.26\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 0565784e..73365d26 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index f61c084e..0fd7d9e5 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -1,9 +1,9 @@ - + - + Debug @@ -69,9 +69,9 @@ 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/dnchost/packages.config b/src/dnchost/packages.config index fdcf876c..e52c0a7a 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -3,6 +3,6 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 037adc99..4071942c 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -68,9 +68,9 @@ 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/mbahost/packages.config b/src/mbahost/packages.config index 1b4c9487..7cbb7bbe 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -2,6 +2,6 @@ - - + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs index b38e9f6e..f5999c98 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs @@ -3,10 +3,10 @@ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> - - - - + + + + diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs index b3072e63..ae27457f 100644 --- a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs +++ b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs @@ -3,10 +3,10 @@ xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal"> - - - - + + + + diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 1224fa49..7fc831d1 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 d08565ff..04f4f9d1 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -1,56 +1,20 @@ - - - + - {CC4236FC-226E-4232-AB50-24CBEC4D314D} + net20 Example.FullFramework2MBA - Library Example.FullFramework2MBA - v2.0 - false - - - true - false - $(DefineConstants);DEBUG;TRACE - - - true - true - $(DefineConstants);TRACE + embedded + win-x86 - - - - - + + - - - - - - - - - ..\..\..\..\packages\WixToolset.Mba.Core.4.0.22\lib\net20\WixToolset.Mba.Core.dll - + - - - - - - - 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/FullFramework2BAFactory.cs b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs index 40cff30f..647c2040 100644 --- a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs +++ b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs @@ -1,5 +1,6 @@ // 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. +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))] namespace Example.FullFramework2MBA { using WixToolset.Mba.Core; diff --git a/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs b/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs deleted file mode 100644 index 640c17ad..00000000 --- a/src/test/examples/FullFramework2MBA/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -using System; -using System.Reflection; -using System.Runtime.InteropServices; -using WixToolset.Mba.Core; - -[assembly: AssemblyTitle("Example.FullFramework2MBA")] -[assembly: AssemblyDescription("Example.FullFramework2MBA")] -[assembly: AssemblyProduct("WiX Toolset")] -[assembly: AssemblyCompany("WiX Toolset Team")] -[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")] - -// Types should not be visible to COM by default. -[assembly: ComVisible(false)] -[assembly: Guid("7A671EAF-FAE5-41A2-83DD-C35AB3779651")] - -[assembly: BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))] diff --git a/src/test/examples/FullFramework2MBA/packages.config b/src/test/examples/FullFramework2MBA/packages.config deleted file mode 100644 index 1f2a91d9..00000000 --- a/src/test/examples/FullFramework2MBA/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ 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 51f7090f..2c702a3b 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -5,11 +5,12 @@ net48 Full Framework v4 MBA + win-x86 - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index dc013b68..ad599e23 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 ef54389d..b863618a 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/packages.config b/src/test/examples/TestEngine/packages.config index 1b4c9487..7cbb7bbe 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -2,6 +2,6 @@ - - + + \ 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 02d400ee..fd03209f 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index c81955be..b767d2c0 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -3,6 +3,7 @@ namespace WixToolset.Bal { using System; + using System.Collections.Generic; using System.Linq; using WixToolset.Bal.Tuples; using WixToolset.Data; @@ -12,6 +13,20 @@ namespace WixToolset.Bal public class BalBurnBackendExtension : BaseBurnBackendExtension { + private static readonly IntermediateTupleDefinition[] BurnTupleDefinitions = + { + BalTupleDefinitions.WixBalBAFactoryAssembly, + BalTupleDefinitions.WixBalBAFunctions, + BalTupleDefinitions.WixBalCondition, + BalTupleDefinitions.WixBalPackageInfo, + BalTupleDefinitions.WixDncOptions, + BalTupleDefinitions.WixMbaPrereqInformation, + BalTupleDefinitions.WixStdbaOptions, + BalTupleDefinitions.WixStdbaOverridableVariable, + }; + + protected override IEnumerable TupleDefinitions => BurnTupleDefinitions; + public override void BundleFinalize() { base.BundleFinalize(); diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 45ca7f88..ae8559d5 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,7 +1,7 @@ - + {3444D952-F21C-496F-AB6B-56435BFD0787} @@ -57,7 +57,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}. - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 6e79c4c9..8ffe0d58 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs index 5c99747d..1b5e1342 100644 --- a/src/wixlib/wixstdba.wxs +++ b/src/wixlib/wixstdba.wxs @@ -13,11 +13,11 @@ - - - !(wix.WixStdbaLicenseRtfName=license.rtf) - - + + + !(wix.WixStdbaLicenseRtfName=license.rtf) + + @@ -30,11 +30,11 @@ - - - !(wix.WixStdbaLicenseRtfName=license.rtf) - - + + + !(wix.WixStdbaLicenseRtfName=license.rtf) + + @@ -45,11 +45,11 @@ - - - !(wix.WixStdbaLicenseUrl) - - + + + !(wix.WixStdbaLicenseUrl) + + @@ -60,11 +60,11 @@ - - - !(wix.WixStdbaLicenseUrl) - - + + + !(wix.WixStdbaLicenseUrl) + + @@ -76,18 +76,18 @@ - - - !(wix.WixStdbaLicenseUrl) - - + + + !(wix.WixStdbaLicenseUrl) + + - - - - + + + + diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 1b4c9487..7cbb7bbe 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -2,6 +2,6 @@ - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index e97c4692..6698c192 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -107,9 +107,9 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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 -- cgit v1.2.3-55-g6feb From dea3a630b6ae10663dd6f7d855541f7f631a2b55 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 24 Jun 2020 18:47:38 +1000 Subject: Update dependencies. Run tests before packing and don't build twice. --- appveyor.cmd | 4 +--- src/Samples/bafunctions/bafunctions.vcxproj | 10 +++++----- src/Samples/bafunctions/packages.config | 4 ++-- src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 1 + src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 3 ++- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 10 +++++----- src/dnchost/packages.config | 4 ++-- src/mbahost/mbahost.vcxproj | 10 +++++----- src/mbahost/packages.config | 4 ++-- .../examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +- .../FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 8 ++++---- src/test/examples/TestEngine/packages.config | 4 ++-- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/wixext/WixToolset.Bal.wixext.csproj | 1 + src/wixlib/bal.wixproj | 10 +++------- src/wixlib/packages.config | 2 +- src/wixstdba/packages.config | 4 ++-- src/wixstdba/wixstdba.vcxproj | 10 +++++----- 22 files changed, 49 insertions(+), 52 deletions(-) (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index 295607cb..95b09f81 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -7,12 +7,10 @@ nuget restore || exit /b msbuild -p:Configuration=%_C% -t:Restore || exit /b msbuild -p:Configuration=%_C% || exit /b +dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b -msbuild -p:Configuration=%_C% src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj || exit /b -dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b - @popd @endlocal \ No newline at end of file diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 92637507..d35c85c0 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02} DynamicLibrary - v141 + v142 Unicode BAFunctions bafunctions.def @@ -57,9 +57,9 @@ 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}. - + - + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 7cbb7bbe..65e7225a 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -2,6 +2,6 @@ - - + + \ No newline at end of file diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index 09580c2d..627ea67a 100644 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -7,6 +7,7 @@ WixToolset.Dnc.Host WiX Toolset .NET Core BA Host WiX Toolset .NET Core BA Host + embedded diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 2c912f3d..0fedd9dc 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -11,6 +11,7 @@ 0693;1591 v2.0 Managed Bootstrapper Application entry point + embedded true @@ -44,7 +45,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.26\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.31\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 73365d26..d1b22e73 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 0fd7d9e5..6bab8063 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -1,9 +1,9 @@ - + - + Debug @@ -17,7 +17,7 @@ {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} DynamicLibrary - v141 + v142 Unicode dnchost dnchost.def @@ -69,9 +69,9 @@ 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/dnchost/packages.config b/src/dnchost/packages.config index e52c0a7a..f1e2c54b 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -3,6 +3,6 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 4071942c..45fef1a1 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ {12C87C77-3547-44F8-8134-29BC915CB19D} DynamicLibrary - v141 + v142 Unicode mbahost mbahost.def @@ -68,9 +68,9 @@ 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/mbahost/packages.config b/src/mbahost/packages.config index 7cbb7bbe..65e7225a 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -2,6 +2,6 @@ - - + + \ No newline at end of file diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 7fc831d1..b2c7dd29 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 04f4f9d1..958047b0 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -15,6 +15,6 @@ - + \ 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 2c702a3b..1f61d9d1 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index ad599e23..dc2b8a5f 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 b863618a..7fb3b3aa 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/packages.config b/src/test/examples/TestEngine/packages.config index 7cbb7bbe..65e7225a 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -2,6 +2,6 @@ - - + + \ 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 fd03209f..393b403e 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index aef4c4d9..aa3c4033 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -9,6 +9,7 @@ WiX Toolset Bal Extension true build + embedded diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index ae8559d5..c23af015 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,7 +1,7 @@ - - + + {3444D952-F21C-496F-AB6B-56435BFD0787} @@ -48,16 +48,12 @@ - - - - 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}. - + diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 8ffe0d58..f37af421 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 7cbb7bbe..65e7225a 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -2,6 +2,6 @@ - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 6698c192..7d116490 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,9 +2,9 @@ - + - + @@ -20,7 +20,7 @@ {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} DynamicLibrary - v141 + v142 Unicode WixStdBA wixstdba.def @@ -107,9 +107,9 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" 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 -- cgit v1.2.3-55-g6feb From 0d3848a8e5fc6ff289a7faa80a77eb43c010011a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 24 Jun 2020 18:52:34 +1000 Subject: Add SourceLink to public projects. --- src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 1 + src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 14 +++++++++++++- src/WixToolset.Mba.Host/packages.config | 3 +++ src/dnchost/dnchost.vcxproj | 14 +++++++++++++- src/dnchost/packages.config | 7 +++++-- src/mbahost/mbahost.vcxproj | 14 +++++++++++++- src/mbahost/packages.config | 5 ++++- src/wixext/WixToolset.Bal.wixext.csproj | 1 + src/wixstdba/packages.config | 5 ++++- src/wixstdba/wixstdba.vcxproj | 14 +++++++++++++- 10 files changed, 70 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index 627ea67a..495b13a2 100644 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -34,6 +34,7 @@ + diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 0fedd9dc..3fedba03 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -1,8 +1,11 @@ - + + + + {F2BA1935-70FA-4156-B161-FD03850B4FAA} WixToolset.Mba.Host @@ -76,11 +79,20 @@ + + + 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}. + + + + + + diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index d1b22e73..829c7898 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -1,5 +1,8 @@  + + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 6bab8063..2a45f9ab 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -1,6 +1,9 @@ + + + @@ -64,14 +67,23 @@ + + + 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/dnchost/packages.config b/src/dnchost/packages.config index f1e2c54b..62f52e92 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -1,8 +1,11 @@  - + + + - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 45fef1a1..918feaa7 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -2,6 +2,9 @@ + + + @@ -63,14 +66,23 @@ + + + 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/mbahost/packages.config b/src/mbahost/packages.config index 65e7225a..660d3b9a 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -1,7 +1,10 @@  + + + - + \ No newline at end of file diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index aa3c4033..ffc9ee5c 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -17,6 +17,7 @@ + diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 65e7225a..660d3b9a 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -1,7 +1,10 @@  + + + - + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 7d116490..04809d3c 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -2,6 +2,9 @@ + + + @@ -102,14 +105,23 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" + + + 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 -- cgit v1.2.3-55-g6feb From a7cbf340236985f2c6294d2c244e5b720b648792 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 24 Jun 2020 20:18:03 +1000 Subject: Create symbols package. --- src/wixext/WixToolset.Bal.wixext.csproj | 13 +++++++++++-- src/wixext/WixToolset.Bal.wixext.nuspec | 25 +++++++++++++++++++++++++ src/wixstdba/wixstdba.vcxproj | 2 +- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 src/wixext/WixToolset.Bal.wixext.nuspec (limited to 'src') diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index ffc9ee5c..4cc790c8 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -7,9 +7,10 @@ WixToolset.Bal WiX Toolset Bal Extension WiX Toolset Bal Extension - true - build embedded + $(MSBuildThisFileName).nuspec + true + Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) @@ -18,6 +19,7 @@ + @@ -28,4 +30,11 @@ + + + + $(OutputPath)..\ + $(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory) + + diff --git a/src/wixext/WixToolset.Bal.wixext.nuspec b/src/wixext/WixToolset.Bal.wixext.nuspec new file mode 100644 index 00000000..38606a5a --- /dev/null +++ b/src/wixext/WixToolset.Bal.wixext.nuspec @@ -0,0 +1,25 @@ + + + + $id$ + $version$ + $authors$ + $authors$ + MS-RL + https://github.com/wixtoolset/Bal.wixext + false + $title$ + $description$ + $copyright$ + + + + + + + + + + + + diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 04809d3c..46769531 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -100,7 +100,7 @@ Compiling message file... mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z wixstdba.messages "$(InputDir)wixstdba.mc" rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - $(IntDir)wixstdba.messages.h;$(OutDir)wixstdba.messages.rc + $(IntDir)wixstdba.messages.h;$(IntDir)wixstdba.messages.rc -- cgit v1.2.3-55-g6feb From b3138ce92cf76c523d77862610a4256c49bcb689 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 27 Jun 2020 01:31:52 -0700 Subject: The Great Tuple to Symbol Rename (tm) --- src/wixext/BalBurnBackendExtension.cs | 72 ++++++++--------- src/wixext/BalCompiler.cs | 90 +++++++++++----------- src/wixext/BalExtensionData.cs | 10 +-- src/wixext/Tuples/BalTupleDefinitions.cs | 60 +++++++-------- src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs | 28 +++---- src/wixext/Tuples/WixBalBAFunctionsTuple.cs | 28 +++---- src/wixext/Tuples/WixBalConditionTuple.cs | 34 ++++---- src/wixext/Tuples/WixBalPackageInfoTuple.cs | 34 ++++---- src/wixext/Tuples/WixDncOptionsTuple.cs | 28 +++---- src/wixext/Tuples/WixMbaPrereqInformationTuple.cs | 40 +++++----- src/wixext/Tuples/WixStdbaOptionsTuple.cs | 52 ++++++------- .../Tuples/WixStdbaOverridableVariableTuple.cs | 28 +++---- 12 files changed, 252 insertions(+), 252 deletions(-) (limited to 'src') diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index b767d2c0..3f2cda05 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -5,27 +5,27 @@ namespace WixToolset.Bal using System; using System.Collections.Generic; using System.Linq; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; using WixToolset.Data; using WixToolset.Data.Burn; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; public class BalBurnBackendExtension : BaseBurnBackendExtension { - private static readonly IntermediateTupleDefinition[] BurnTupleDefinitions = + private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions = { - BalTupleDefinitions.WixBalBAFactoryAssembly, - BalTupleDefinitions.WixBalBAFunctions, - BalTupleDefinitions.WixBalCondition, - BalTupleDefinitions.WixBalPackageInfo, - BalTupleDefinitions.WixDncOptions, - BalTupleDefinitions.WixMbaPrereqInformation, - BalTupleDefinitions.WixStdbaOptions, - BalTupleDefinitions.WixStdbaOverridableVariable, + BalSymbolDefinitions.WixBalBAFactoryAssembly, + BalSymbolDefinitions.WixBalBAFunctions, + BalSymbolDefinitions.WixBalCondition, + BalSymbolDefinitions.WixBalPackageInfo, + BalSymbolDefinitions.WixDncOptions, + BalSymbolDefinitions.WixMbaPrereqInformation, + BalSymbolDefinitions.WixStdbaOptions, + BalSymbolDefinitions.WixStdbaOverridableVariable, }; - protected override IEnumerable TupleDefinitions => BurnTupleDefinitions; + protected override IEnumerable SymbolDefinitions => BurnSymbolDefinitions; public override void BundleFinalize() { @@ -34,8 +34,8 @@ namespace WixToolset.Bal var intermediate = this.Context.IntermediateRepresentation; var section = intermediate.Sections.Single(); - var baTuple = section.Tuples.OfType().SingleOrDefault(); - var baId = baTuple?.Id?.Id; + var baSymbol = section.Symbols.OfType().SingleOrDefault(); + var baId = baSymbol?.Id?.Id; if (null == baId) { return; @@ -59,46 +59,46 @@ namespace WixToolset.Bal private void VerifyBAFunctions(IntermediateSection section) { - WixBalBAFunctionsTuple baFunctionsTuple = null; - foreach (var tuple in section.Tuples.OfType()) + WixBalBAFunctionsSymbol baFunctionsSymbol = null; + foreach (var symbol in section.Symbols.OfType()) { - if (null == baFunctionsTuple) + if (null == baFunctionsSymbol) { - baFunctionsTuple = tuple; + baFunctionsSymbol = symbol; } else { - this.Messaging.Write(BalErrors.MultipleBAFunctions(tuple.SourceLineNumbers)); + this.Messaging.Write(BalErrors.MultipleBAFunctions(symbol.SourceLineNumbers)); } } - var payloadPropertiesTuples = section.Tuples.OfType().ToList(); - if (null == baFunctionsTuple) + var payloadPropertiesSymbols = section.Symbols.OfType().ToList(); + if (null == baFunctionsSymbol) { - foreach (var payloadPropertiesTuple in payloadPropertiesTuples) + foreach (var payloadPropertiesSymbol in payloadPropertiesSymbols) { // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). - if (string.Equals(payloadPropertiesTuple.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(payloadPropertiesSymbol.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) { - this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesTuple.SourceLineNumbers)); + this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesSymbol.SourceLineNumbers)); } } } else { - var payloadId = baFunctionsTuple.Id; - var bundlePayloadTuple = payloadPropertiesTuples.Single(x => payloadId == x.Id); - if (BurnConstants.BurnUXContainerName != bundlePayloadTuple.ContainerRef) + var payloadId = baFunctionsSymbol.Id; + var bundlePayloadSymbol = payloadPropertiesSymbols.Single(x => payloadId == x.Id); + if (BurnConstants.BurnUXContainerName != bundlePayloadSymbol.ContainerRef) { - this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsTuple.SourceLineNumbers)); + this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsSymbol.SourceLineNumbers)); } } } private void VerifyPrereqPackages(IntermediateSection section, bool isDNC) { - var prereqInfoTuples = section.Tuples.OfType().ToList(); - if (prereqInfoTuples.Count == 0) + var prereqInfoSymbols = section.Symbols.OfType().ToList(); + if (prereqInfoSymbols.Count == 0) { var message = isDNC ? BalErrors.MissingDNCPrereq() : BalErrors.MissingMBAPrereq(); this.Messaging.Write(message); @@ -108,24 +108,24 @@ namespace WixToolset.Bal var foundLicenseFile = false; var foundLicenseUrl = false; - foreach (var prereqInfoTuple in prereqInfoTuples) + foreach (var prereqInfoSymbol in prereqInfoSymbols) { - if (null != prereqInfoTuple.LicenseFile) + if (null != prereqInfoSymbol.LicenseFile) { if (foundLicenseFile || foundLicenseUrl) { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers)); + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); return; } foundLicenseFile = true; } - if (null != prereqInfoTuple.LicenseUrl) + if (null != prereqInfoSymbol.LicenseUrl) { if (foundLicenseFile || foundLicenseUrl) { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoTuple.SourceLineNumbers)); + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); return; } @@ -138,7 +138,7 @@ namespace WixToolset.Bal { var isSCD = false; - var dncOptions = section.Tuples.OfType().SingleOrDefault(); + var dncOptions = section.Symbols.OfType().SingleOrDefault(); if (dncOptions != null) { isSCD = dncOptions.SelfContainedDeployment != 0; diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 03b74e57..294cf45c 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -5,9 +5,9 @@ namespace WixToolset.Bal using System; using System.Collections.Generic; using System.Xml.Linq; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; using WixToolset.Data; - using WixToolset.Data.Tuples; + using WixToolset.Data.Symbols; using WixToolset.Extensibility; /// @@ -15,14 +15,14 @@ namespace WixToolset.Bal /// public sealed class BalCompiler : BaseCompilerExtension { - private readonly Dictionary prereqInfoTuplesByPackageId; + private readonly Dictionary prereqInfoSymbolsByPackageId; /// /// Instantiate a new BalCompiler. /// public BalCompiler() { - this.prereqInfoTuplesByPackageId = new Dictionary(); + this.prereqInfoSymbolsByPackageId = new Dictionary(); } public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/bal"; @@ -87,7 +87,7 @@ namespace WixToolset.Bal public override void ParseAttribute(Intermediate intermediate, IntermediateSection section, XElement parentElement, XAttribute attribute, IDictionary context) { var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(parentElement); - WixMbaPrereqInformationTuple prereqInfo; + WixMbaPrereqInformationSymbol prereqInfo; switch (parentElement.Name.LocalName) { @@ -110,7 +110,7 @@ namespace WixToolset.Bal case "MsiPackage": case "MspPackage": var displayInternalUICondition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); - section.AddTuple(new WixBalPackageInfoTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, packageId)) + section.AddSymbol(new WixBalPackageInfoSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, packageId)) { PackageId = packageId, DisplayInternalUICondition = displayInternalUICondition, @@ -123,7 +123,7 @@ namespace WixToolset.Bal break; case "PrereqLicenseFile": - if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) + if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) { // at the time the extension attribute is parsed, the compiler might not yet have // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. @@ -131,12 +131,12 @@ namespace WixToolset.Bal if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) { PackageId = packageId, }); - this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo); + this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); } else { @@ -156,7 +156,7 @@ namespace WixToolset.Bal break; case "PrereqLicenseUrl": - if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) + if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) { // at the time the extension attribute is parsed, the compiler might not yet have // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. @@ -164,12 +164,12 @@ namespace WixToolset.Bal if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) { - prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) { PackageId = packageId, }); - this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo); + this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); } else { @@ -190,14 +190,14 @@ namespace WixToolset.Bal case "PrereqPackage": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - if (!this.prereqInfoTuplesByPackageId.TryGetValue(packageId, out prereqInfo)) + if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) { - prereqInfo = section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) { PackageId = packageId, }); - this.prereqInfoTuplesByPackageId.Add(packageId, prereqInfo); + this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); } } break; @@ -222,7 +222,7 @@ namespace WixToolset.Bal { // There can only be one. var id = new Identifier(AccessModifier.Public, "TheBAFactoryAssembly"); - section.AddTuple(new WixBalBAFactoryAssemblyTuple(sourceLineNumbers, id) + section.AddSymbol(new WixBalBAFactoryAssemblySymbol(sourceLineNumbers, id) { PayloadId = payloadId, }); @@ -231,7 +231,7 @@ namespace WixToolset.Bal case "BAFunctions": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - section.AddTuple(new WixBalBAFunctionsTuple(sourceLineNumbers) + section.AddSymbol(new WixBalBAFunctionsSymbol(sourceLineNumbers) { PayloadId = payloadId, }); @@ -258,7 +258,7 @@ namespace WixToolset.Bal case "Overridable": if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { - section.AddTuple(new WixStdbaOverridableVariableTuple(sourceLineNumbers) + section.AddSymbol(new WixStdbaOverridableVariableSymbol(sourceLineNumbers) { Name = variableName.Value, }); @@ -318,7 +318,7 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixBalConditionTuple(sourceLineNumbers) + section.AddSymbol(new WixBalConditionSymbol(sourceLineNumbers) { Condition = condition, Message = message, @@ -378,13 +378,13 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { - section.AddTuple(new WixMbaPrereqInformationTuple(sourceLineNumbers) + section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) { PackageId = packageId, LicenseFile = licenseFile, LicenseUrl = licenseUrl, }); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, TupleDefinitions.WixBundlePackage, packageId); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePackage, packageId); } } @@ -488,7 +488,7 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(launchTarget)) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) { Value = launchTarget, Type = "string", @@ -497,7 +497,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchTargetElevatedId)) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId")) { Value = launchTargetElevatedId, Type = "string", @@ -506,7 +506,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchArguments)) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments")) { Value = launchArguments, Type = "string", @@ -515,7 +515,7 @@ namespace WixToolset.Bal if (YesNoType.Yes == launchHidden) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden")) { Value = "yes", Type = "string", @@ -525,7 +525,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchWorkingDir)) { - section.AddTuple(new WixBundleVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder")) { Value = launchWorkingDir, Type = "string", @@ -534,7 +534,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(licenseFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf")) { Value = licenseFile, }); @@ -542,7 +542,7 @@ namespace WixToolset.Bal if (null != licenseUrl) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl")) { Value = licenseUrl, }); @@ -550,7 +550,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(logoFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo")) { Value = logoFile, }); @@ -558,7 +558,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(logoSideFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide")) { Value = logoSideFile, }); @@ -566,7 +566,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(themeFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml")) { Value = themeFile, }); @@ -574,7 +574,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(localizationFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl")) { Value = localizationFile, }); @@ -582,30 +582,30 @@ namespace WixToolset.Bal if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly) { - var tuple = section.AddTuple(new WixStdbaOptionsTuple(sourceLineNumbers)); + var symbol = section.AddSymbol(new WixStdbaOptionsSymbol(sourceLineNumbers)); if (YesNoType.Yes == suppressOptionsUI) { - tuple.SuppressOptionsUI = 1; + symbol.SuppressOptionsUI = 1; } if (YesNoType.Yes == suppressDowngradeFailure) { - tuple.SuppressDowngradeFailure = 1; + symbol.SuppressDowngradeFailure = 1; } if (YesNoType.Yes == suppressRepair) { - tuple.SuppressRepair = 1; + symbol.SuppressRepair = 1; } if (YesNoType.Yes == showVersion) { - tuple.ShowVersion = 1; + symbol.ShowVersion = 1; } if (YesNoType.Yes == supportCacheOnly) { - tuple.SupportCacheOnly = 1; + symbol.SupportCacheOnly = 1; } } } @@ -654,7 +654,7 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(logoFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) { Value = logoFile, }); @@ -662,7 +662,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(themeFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml")) { Value = themeFile, }); @@ -670,7 +670,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(localizationFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl")) { Value = localizationFile, }); @@ -725,7 +725,7 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(logoFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) { Value = logoFile, }); @@ -733,7 +733,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(themeFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml")) { Value = themeFile, }); @@ -741,7 +741,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(localizationFile)) { - section.AddTuple(new WixVariableTuple(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl")) { Value = localizationFile, }); @@ -749,7 +749,7 @@ namespace WixToolset.Bal if (YesNoType.Yes == selfContainedDeployment) { - section.AddTuple(new WixDncOptionsTuple(sourceLineNumbers) + section.AddSymbol(new WixDncOptionsSymbol(sourceLineNumbers) { SelfContainedDeployment = 1, }); diff --git a/src/wixext/BalExtensionData.cs b/src/wixext/BalExtensionData.cs index 46152b53..55daf005 100644 --- a/src/wixext/BalExtensionData.cs +++ b/src/wixext/BalExtensionData.cs @@ -16,15 +16,15 @@ namespace WixToolset.Bal /// The default culture. public override string DefaultCulture => "en-US"; - public override bool TryGetTupleDefinitionByName(string name, out IntermediateTupleDefinition tupleDefinition) + public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) { - tupleDefinition = BalTupleDefinitions.ByName(name); - return tupleDefinition != null; + symbolDefinition = BalSymbolDefinitions.ByName(name); + return symbolDefinition != null; } - public override Intermediate GetLibrary(ITupleDefinitionCreator tupleDefinitions) + public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) { - return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", tupleDefinitions); + return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", symbolDefinitions); } } } diff --git a/src/wixext/Tuples/BalTupleDefinitions.cs b/src/wixext/Tuples/BalTupleDefinitions.cs index 08e7ba2a..90865621 100644 --- a/src/wixext/Tuples/BalTupleDefinitions.cs +++ b/src/wixext/Tuples/BalTupleDefinitions.cs @@ -6,7 +6,7 @@ namespace WixToolset.Bal using WixToolset.Data; using WixToolset.Data.Burn; - public enum BalTupleDefinitionType + public enum BalSymbolDefinitionType { WixBalBAFactoryAssembly, WixBalBAFunctions, @@ -18,13 +18,13 @@ namespace WixToolset.Bal WixStdbaOverridableVariable, } - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { public static readonly Version Version = new Version("4.0.0"); - public static IntermediateTupleDefinition ByName(string name) + public static IntermediateSymbolDefinition ByName(string name) { - if (!Enum.TryParse(name, out BalTupleDefinitionType type)) + if (!Enum.TryParse(name, out BalSymbolDefinitionType type)) { return null; } @@ -32,49 +32,49 @@ namespace WixToolset.Bal return ByType(type); } - public static IntermediateTupleDefinition ByType(BalTupleDefinitionType type) + public static IntermediateSymbolDefinition ByType(BalSymbolDefinitionType type) { switch (type) { - case BalTupleDefinitionType.WixBalBAFactoryAssembly: - return BalTupleDefinitions.WixBalBAFactoryAssembly; + case BalSymbolDefinitionType.WixBalBAFactoryAssembly: + return BalSymbolDefinitions.WixBalBAFactoryAssembly; - case BalTupleDefinitionType.WixBalBAFunctions: - return BalTupleDefinitions.WixBalBAFunctions; + case BalSymbolDefinitionType.WixBalBAFunctions: + return BalSymbolDefinitions.WixBalBAFunctions; - case BalTupleDefinitionType.WixBalCondition: - return BalTupleDefinitions.WixBalCondition; + case BalSymbolDefinitionType.WixBalCondition: + return BalSymbolDefinitions.WixBalCondition; - case BalTupleDefinitionType.WixBalPackageInfo: - return BalTupleDefinitions.WixBalPackageInfo; + case BalSymbolDefinitionType.WixBalPackageInfo: + return BalSymbolDefinitions.WixBalPackageInfo; - case BalTupleDefinitionType.WixDncOptions: - return BalTupleDefinitions.WixDncOptions; + case BalSymbolDefinitionType.WixDncOptions: + return BalSymbolDefinitions.WixDncOptions; - case BalTupleDefinitionType.WixMbaPrereqInformation: - return BalTupleDefinitions.WixMbaPrereqInformation; + case BalSymbolDefinitionType.WixMbaPrereqInformation: + return BalSymbolDefinitions.WixMbaPrereqInformation; - case BalTupleDefinitionType.WixStdbaOptions: - return BalTupleDefinitions.WixStdbaOptions; + case BalSymbolDefinitionType.WixStdbaOptions: + return BalSymbolDefinitions.WixStdbaOptions; - case BalTupleDefinitionType.WixStdbaOverridableVariable: - return BalTupleDefinitions.WixStdbaOverridableVariable; + case BalSymbolDefinitionType.WixStdbaOverridableVariable: + return BalSymbolDefinitions.WixStdbaOverridableVariable; default: throw new ArgumentOutOfRangeException(nameof(type)); } } - static BalTupleDefinitions() + static BalSymbolDefinitions() { - WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); - WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataTupleDefinitionTag); + WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); } } } diff --git a/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs b/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs index e33ea562..0423a52f 100644 --- a/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs +++ b/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs @@ -3,45 +3,45 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixBalBAFactoryAssembly = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixBalBAFactoryAssembly.ToString(), + public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixBalBAFactoryTupleFields.PayloadId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String), }, - typeof(WixBalBAFactoryAssemblyTuple)); + typeof(WixBalBAFactoryAssemblySymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixBalBAFactoryTupleFields + public enum WixBalBAFactorySymbolFields { PayloadId, } - public class WixBalBAFactoryAssemblyTuple : IntermediateTuple + public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol { - public WixBalBAFactoryAssemblyTuple() : base(BalTupleDefinitions.WixBalBAFactoryAssembly, null, null) + public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null) { } - public WixBalBAFactoryAssemblyTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id) + public WixBalBAFactoryAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id) { } - public IntermediateField this[WixBalBAFactoryTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixBalBAFactorySymbolFields index] => this.Fields[(int)index]; public string PayloadId { - get => this.Fields[(int)WixBalBAFactoryTupleFields.PayloadId].AsString(); - set => this.Set((int)WixBalBAFactoryTupleFields.PayloadId, value); + get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalBAFunctionsTuple.cs b/src/wixext/Tuples/WixBalBAFunctionsTuple.cs index f753f239..19c7602d 100644 --- a/src/wixext/Tuples/WixBalBAFunctionsTuple.cs +++ b/src/wixext/Tuples/WixBalBAFunctionsTuple.cs @@ -3,45 +3,45 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixBalBAFunctions = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixBalBAFunctions.ToString(), + public static readonly IntermediateSymbolDefinition WixBalBAFunctions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalBAFunctions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixBalBAFunctionsTupleFields.PayloadId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.PayloadId), IntermediateFieldType.String), }, - typeof(WixBalBAFunctionsTuple)); + typeof(WixBalBAFunctionsSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixBalBAFunctionsTupleFields + public enum WixBalBAFunctionsSymbolFields { PayloadId, } - public class WixBalBAFunctionsTuple : IntermediateTuple + public class WixBalBAFunctionsSymbol : IntermediateSymbol { - public WixBalBAFunctionsTuple() : base(BalTupleDefinitions.WixBalBAFunctions, null, null) + public WixBalBAFunctionsSymbol() : base(BalSymbolDefinitions.WixBalBAFunctions, null, null) { } - public WixBalBAFunctionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalBAFunctions, sourceLineNumber, id) + public WixBalBAFunctionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFunctions, sourceLineNumber, id) { } - public IntermediateField this[WixBalBAFunctionsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixBalBAFunctionsSymbolFields index] => this.Fields[(int)index]; public string PayloadId { - get => this.Fields[(int)WixBalBAFunctionsTupleFields.PayloadId].AsString(); - set => this.Set((int)WixBalBAFunctionsTupleFields.PayloadId, value); + get => this.Fields[(int)WixBalBAFunctionsSymbolFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFunctionsSymbolFields.PayloadId, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalConditionTuple.cs b/src/wixext/Tuples/WixBalConditionTuple.cs index 4c0ddd1d..c2527fbc 100644 --- a/src/wixext/Tuples/WixBalConditionTuple.cs +++ b/src/wixext/Tuples/WixBalConditionTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixBalCondition = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixBalCondition.ToString(), + public static readonly IntermediateSymbolDefinition WixBalCondition = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalCondition.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Condition), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBalConditionTupleFields.Message), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Message), IntermediateFieldType.String), }, - typeof(WixBalConditionTuple)); + typeof(WixBalConditionSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixBalConditionTupleFields + public enum WixBalConditionSymbolFields { Condition, Message, } - public class WixBalConditionTuple : IntermediateTuple + public class WixBalConditionSymbol : IntermediateSymbol { - public WixBalConditionTuple() : base(BalTupleDefinitions.WixBalCondition, null, null) + public WixBalConditionSymbol() : base(BalSymbolDefinitions.WixBalCondition, null, null) { } - public WixBalConditionTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalCondition, sourceLineNumber, id) + public WixBalConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalCondition, sourceLineNumber, id) { } - public IntermediateField this[WixBalConditionTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixBalConditionSymbolFields index] => this.Fields[(int)index]; public string Condition { - get => this.Fields[(int)WixBalConditionTupleFields.Condition].AsString(); - set => this.Set((int)WixBalConditionTupleFields.Condition, value); + get => this.Fields[(int)WixBalConditionSymbolFields.Condition].AsString(); + set => this.Set((int)WixBalConditionSymbolFields.Condition, value); } public string Message { - get => this.Fields[(int)WixBalConditionTupleFields.Message].AsString(); - set => this.Set((int)WixBalConditionTupleFields.Message, value); + get => this.Fields[(int)WixBalConditionSymbolFields.Message].AsString(); + set => this.Set((int)WixBalConditionSymbolFields.Message, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalPackageInfoTuple.cs b/src/wixext/Tuples/WixBalPackageInfoTuple.cs index 32be3105..b09cb191 100644 --- a/src/wixext/Tuples/WixBalPackageInfoTuple.cs +++ b/src/wixext/Tuples/WixBalPackageInfoTuple.cs @@ -3,53 +3,53 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixBalPackageInfo = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixBalPackageInfo.ToString(), + public static readonly IntermediateSymbolDefinition WixBalPackageInfo = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalPackageInfo.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.PackageId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBalPackageInfoTupleFields.DisplayInternalUICondition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.DisplayInternalUICondition), IntermediateFieldType.String), }, - typeof(WixBalPackageInfoTuple)); + typeof(WixBalPackageInfoSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixBalPackageInfoTupleFields + public enum WixBalPackageInfoSymbolFields { PackageId, DisplayInternalUICondition, } - public class WixBalPackageInfoTuple : IntermediateTuple + public class WixBalPackageInfoSymbol : IntermediateSymbol { - public WixBalPackageInfoTuple() : base(BalTupleDefinitions.WixBalPackageInfo, null, null) + public WixBalPackageInfoSymbol() : base(BalSymbolDefinitions.WixBalPackageInfo, null, null) { } - public WixBalPackageInfoTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixBalPackageInfo, sourceLineNumber, id) + public WixBalPackageInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalPackageInfo, sourceLineNumber, id) { } - public IntermediateField this[WixBalPackageInfoTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixBalPackageInfoSymbolFields index] => this.Fields[(int)index]; public string PackageId { - get => this.Fields[(int)WixBalPackageInfoTupleFields.PackageId].AsString(); - set => this.Set((int)WixBalPackageInfoTupleFields.PackageId, value); + get => this.Fields[(int)WixBalPackageInfoSymbolFields.PackageId].AsString(); + set => this.Set((int)WixBalPackageInfoSymbolFields.PackageId, value); } public string DisplayInternalUICondition { - get => this.Fields[(int)WixBalPackageInfoTupleFields.DisplayInternalUICondition].AsString(); - set => this.Set((int)WixBalPackageInfoTupleFields.DisplayInternalUICondition, value); + get => this.Fields[(int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition].AsString(); + set => this.Set((int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition, value); } } } diff --git a/src/wixext/Tuples/WixDncOptionsTuple.cs b/src/wixext/Tuples/WixDncOptionsTuple.cs index 8a36879b..b9a41c21 100644 --- a/src/wixext/Tuples/WixDncOptionsTuple.cs +++ b/src/wixext/Tuples/WixDncOptionsTuple.cs @@ -3,45 +3,45 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixDncOptions = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixDncOptions.ToString(), + public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixDncOptions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixDncOptionsTupleFields.SelfContainedDeployment), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number), }, - typeof(WixDncOptionsTuple)); + typeof(WixDncOptionsSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixDncOptionsTupleFields + public enum WixDncOptionsSymbolFields { SelfContainedDeployment, } - public class WixDncOptionsTuple : IntermediateTuple + public class WixDncOptionsSymbol : IntermediateSymbol { - public WixDncOptionsTuple() : base(BalTupleDefinitions.WixDncOptions, null, null) + public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null) { } - public WixDncOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixDncOptions, sourceLineNumber, id) + public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id) { } - public IntermediateField this[WixDncOptionsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index]; public int SelfContainedDeployment { - get => this.Fields[(int)WixDncOptionsTupleFields.SelfContainedDeployment].AsNumber(); - set => this.Set((int)WixDncOptionsTupleFields.SelfContainedDeployment, value); + get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber(); + set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs b/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs index bcbe9f84..e4d78da0 100644 --- a/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs +++ b/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs @@ -3,61 +3,61 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixMbaPrereqInformation = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixMbaPrereqInformation.ToString(), + public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.PackageId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationTupleFields.LicenseUrl), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String), }, - typeof(WixMbaPrereqInformationTuple)); + typeof(WixMbaPrereqInformationSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixMbaPrereqInformationTupleFields + public enum WixMbaPrereqInformationSymbolFields { PackageId, LicenseFile, LicenseUrl, } - public class WixMbaPrereqInformationTuple : IntermediateTuple + public class WixMbaPrereqInformationSymbol : IntermediateSymbol { - public WixMbaPrereqInformationTuple() : base(BalTupleDefinitions.WixMbaPrereqInformation, null, null) + public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null) { } - public WixMbaPrereqInformationTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixMbaPrereqInformation, sourceLineNumber, id) + public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id) { } - public IntermediateField this[WixMbaPrereqInformationTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index]; public string PackageId { - get => this.Fields[(int)WixMbaPrereqInformationTupleFields.PackageId].AsString(); - set => this.Set((int)WixMbaPrereqInformationTupleFields.PackageId, value); + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value); } public string LicenseFile { - get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseFile].AsString(); - set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseFile, value); + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value); } public string LicenseUrl { - get => this.Fields[(int)WixMbaPrereqInformationTupleFields.LicenseUrl].AsString(); - set => this.Set((int)WixMbaPrereqInformationTupleFields.LicenseUrl, value); + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixStdbaOptionsTuple.cs b/src/wixext/Tuples/WixStdbaOptionsTuple.cs index d930eb47..cb2694da 100644 --- a/src/wixext/Tuples/WixStdbaOptionsTuple.cs +++ b/src/wixext/Tuples/WixStdbaOptionsTuple.cs @@ -3,29 +3,29 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixStdbaOptions = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixStdbaOptions.ToString(), + public static readonly IntermediateSymbolDefinition WixStdbaOptions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixStdbaOptions.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressOptionsUI), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressDowngradeFailure), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SuppressRepair), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.ShowVersion), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsTupleFields.SupportCacheOnly), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressOptionsUI), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressDowngradeFailure), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressRepair), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.ShowVersion), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SupportCacheOnly), IntermediateFieldType.Number), }, - typeof(WixStdbaOptionsTuple)); + typeof(WixStdbaOptionsSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixStdbaOptionsTupleFields + public enum WixStdbaOptionsSymbolFields { SuppressOptionsUI, SuppressDowngradeFailure, @@ -34,46 +34,46 @@ namespace WixToolset.Bal.Tuples SupportCacheOnly, } - public class WixStdbaOptionsTuple : IntermediateTuple + public class WixStdbaOptionsSymbol : IntermediateSymbol { - public WixStdbaOptionsTuple() : base(BalTupleDefinitions.WixStdbaOptions, null, null) + public WixStdbaOptionsSymbol() : base(BalSymbolDefinitions.WixStdbaOptions, null, null) { } - public WixStdbaOptionsTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOptions, sourceLineNumber, id) + public WixStdbaOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOptions, sourceLineNumber, id) { } - public IntermediateField this[WixStdbaOptionsTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixStdbaOptionsSymbolFields index] => this.Fields[(int)index]; public int SuppressOptionsUI { - get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressOptionsUI].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.SuppressOptionsUI, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressOptionsUI].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressOptionsUI, value); } public int SuppressDowngradeFailure { - get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.SuppressDowngradeFailure, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure, value); } public int SuppressRepair { - get => this.Fields[(int)WixStdbaOptionsTupleFields.SuppressRepair].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.SuppressRepair, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressRepair].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressRepair, value); } public int ShowVersion { - get => this.Fields[(int)WixStdbaOptionsTupleFields.ShowVersion].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.ShowVersion, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.ShowVersion].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.ShowVersion, value); } public int SupportCacheOnly { - get => this.Fields[(int)WixStdbaOptionsTupleFields.SupportCacheOnly].AsNumber(); - set => this.Set((int)WixStdbaOptionsTupleFields.SupportCacheOnly, value); + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SupportCacheOnly].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value); } } } \ No newline at end of file diff --git a/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs b/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs index 3ba982ea..1d84d1aa 100644 --- a/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs +++ b/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs @@ -3,45 +3,45 @@ namespace WixToolset.Bal { using WixToolset.Data; - using WixToolset.Bal.Tuples; + using WixToolset.Bal.Symbols; - public static partial class BalTupleDefinitions + public static partial class BalSymbolDefinitions { - public static readonly IntermediateTupleDefinition WixStdbaOverridableVariable = new IntermediateTupleDefinition( - BalTupleDefinitionType.WixStdbaOverridableVariable.ToString(), + public static readonly IntermediateSymbolDefinition WixStdbaOverridableVariable = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixStdbaOverridableVariable.ToString(), new[] { - new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableTupleFields.Name), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableSymbolFields.Name), IntermediateFieldType.String), }, - typeof(WixStdbaOverridableVariableTuple)); + typeof(WixStdbaOverridableVariableSymbol)); } } -namespace WixToolset.Bal.Tuples +namespace WixToolset.Bal.Symbols { using WixToolset.Data; - public enum WixStdbaOverridableVariableTupleFields + public enum WixStdbaOverridableVariableSymbolFields { Name, } - public class WixStdbaOverridableVariableTuple : IntermediateTuple + public class WixStdbaOverridableVariableSymbol : IntermediateSymbol { - public WixStdbaOverridableVariableTuple() : base(BalTupleDefinitions.WixStdbaOverridableVariable, null, null) + public WixStdbaOverridableVariableSymbol() : base(BalSymbolDefinitions.WixStdbaOverridableVariable, null, null) { } - public WixStdbaOverridableVariableTuple(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalTupleDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id) + public WixStdbaOverridableVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id) { } - public IntermediateField this[WixStdbaOverridableVariableTupleFields index] => this.Fields[(int)index]; + public IntermediateField this[WixStdbaOverridableVariableSymbolFields index] => this.Fields[(int)index]; public string Name { - get => this.Fields[(int)WixStdbaOverridableVariableTupleFields.Name].AsString(); - set => this.Set((int)WixStdbaOverridableVariableTupleFields.Name, value); + get => this.Fields[(int)WixStdbaOverridableVariableSymbolFields.Name].AsString(); + set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value); } } } \ No newline at end of file -- cgit v1.2.3-55-g6feb From 59fa31de1eb64809888e218064a97d417060d110 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 27 Jun 2020 01:38:32 -0700 Subject: The Great Tuple to Symbol File Rename (tm) --- src/wixext/Symbols/BalSymbolDefinitions.cs | 80 ++++++++++++++++++++++ .../Symbols/WixBalBAFactoryAssemblySymbol.cs | 47 +++++++++++++ src/wixext/Symbols/WixBalBAFunctionsSymbol.cs | 47 +++++++++++++ src/wixext/Symbols/WixBalConditionSymbol.cs | 55 +++++++++++++++ src/wixext/Symbols/WixBalPackageInfoSymbol.cs | 55 +++++++++++++++ src/wixext/Symbols/WixDncOptionsSymbol.cs | 47 +++++++++++++ .../Symbols/WixMbaPrereqInformationSymbol.cs | 63 +++++++++++++++++ src/wixext/Symbols/WixStdbaOptionsSymbol.cs | 79 +++++++++++++++++++++ .../Symbols/WixStdbaOverridableVariableSymbol.cs | 47 +++++++++++++ src/wixext/Tuples/BalTupleDefinitions.cs | 80 ---------------------- src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs | 47 ------------- src/wixext/Tuples/WixBalBAFunctionsTuple.cs | 47 ------------- src/wixext/Tuples/WixBalConditionTuple.cs | 55 --------------- src/wixext/Tuples/WixBalPackageInfoTuple.cs | 55 --------------- src/wixext/Tuples/WixDncOptionsTuple.cs | 47 ------------- src/wixext/Tuples/WixMbaPrereqInformationTuple.cs | 63 ----------------- src/wixext/Tuples/WixStdbaOptionsTuple.cs | 79 --------------------- .../Tuples/WixStdbaOverridableVariableTuple.cs | 47 ------------- 18 files changed, 520 insertions(+), 520 deletions(-) create mode 100644 src/wixext/Symbols/BalSymbolDefinitions.cs create mode 100644 src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs create mode 100644 src/wixext/Symbols/WixBalBAFunctionsSymbol.cs create mode 100644 src/wixext/Symbols/WixBalConditionSymbol.cs create mode 100644 src/wixext/Symbols/WixBalPackageInfoSymbol.cs create mode 100644 src/wixext/Symbols/WixDncOptionsSymbol.cs create mode 100644 src/wixext/Symbols/WixMbaPrereqInformationSymbol.cs create mode 100644 src/wixext/Symbols/WixStdbaOptionsSymbol.cs create mode 100644 src/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs delete mode 100644 src/wixext/Tuples/BalTupleDefinitions.cs delete mode 100644 src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs delete mode 100644 src/wixext/Tuples/WixBalBAFunctionsTuple.cs delete mode 100644 src/wixext/Tuples/WixBalConditionTuple.cs delete mode 100644 src/wixext/Tuples/WixBalPackageInfoTuple.cs delete mode 100644 src/wixext/Tuples/WixDncOptionsTuple.cs delete mode 100644 src/wixext/Tuples/WixMbaPrereqInformationTuple.cs delete mode 100644 src/wixext/Tuples/WixStdbaOptionsTuple.cs delete mode 100644 src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs (limited to 'src') diff --git a/src/wixext/Symbols/BalSymbolDefinitions.cs b/src/wixext/Symbols/BalSymbolDefinitions.cs new file mode 100644 index 00000000..90865621 --- /dev/null +++ b/src/wixext/Symbols/BalSymbolDefinitions.cs @@ -0,0 +1,80 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using WixToolset.Data; + using WixToolset.Data.Burn; + + public enum BalSymbolDefinitionType + { + WixBalBAFactoryAssembly, + WixBalBAFunctions, + WixBalCondition, + WixBalPackageInfo, + WixDncOptions, + WixMbaPrereqInformation, + WixStdbaOptions, + WixStdbaOverridableVariable, + } + + public static partial class BalSymbolDefinitions + { + public static readonly Version Version = new Version("4.0.0"); + + public static IntermediateSymbolDefinition ByName(string name) + { + if (!Enum.TryParse(name, out BalSymbolDefinitionType type)) + { + return null; + } + + return ByType(type); + } + + public static IntermediateSymbolDefinition ByType(BalSymbolDefinitionType type) + { + switch (type) + { + case BalSymbolDefinitionType.WixBalBAFactoryAssembly: + return BalSymbolDefinitions.WixBalBAFactoryAssembly; + + case BalSymbolDefinitionType.WixBalBAFunctions: + return BalSymbolDefinitions.WixBalBAFunctions; + + case BalSymbolDefinitionType.WixBalCondition: + return BalSymbolDefinitions.WixBalCondition; + + case BalSymbolDefinitionType.WixBalPackageInfo: + return BalSymbolDefinitions.WixBalPackageInfo; + + case BalSymbolDefinitionType.WixDncOptions: + return BalSymbolDefinitions.WixDncOptions; + + case BalSymbolDefinitionType.WixMbaPrereqInformation: + return BalSymbolDefinitions.WixMbaPrereqInformation; + + case BalSymbolDefinitionType.WixStdbaOptions: + return BalSymbolDefinitions.WixStdbaOptions; + + case BalSymbolDefinitionType.WixStdbaOverridableVariable: + return BalSymbolDefinitions.WixStdbaOverridableVariable; + + default: + throw new ArgumentOutOfRangeException(nameof(type)); + } + } + + static BalSymbolDefinitions() + { + WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + } + } +} diff --git a/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs b/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs new file mode 100644 index 00000000..0423a52f --- /dev/null +++ b/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String), + }, + typeof(WixBalBAFactoryAssemblySymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixBalBAFactorySymbolFields + { + PayloadId, + } + + public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol + { + public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null) + { + } + + public WixBalBAFactoryAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalBAFactorySymbolFields index] => this.Fields[(int)index]; + + public string PayloadId + { + get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixBalBAFunctionsSymbol.cs b/src/wixext/Symbols/WixBalBAFunctionsSymbol.cs new file mode 100644 index 00000000..19c7602d --- /dev/null +++ b/src/wixext/Symbols/WixBalBAFunctionsSymbol.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixBalBAFunctions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalBAFunctions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.PayloadId), IntermediateFieldType.String), + }, + typeof(WixBalBAFunctionsSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixBalBAFunctionsSymbolFields + { + PayloadId, + } + + public class WixBalBAFunctionsSymbol : IntermediateSymbol + { + public WixBalBAFunctionsSymbol() : base(BalSymbolDefinitions.WixBalBAFunctions, null, null) + { + } + + public WixBalBAFunctionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFunctions, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalBAFunctionsSymbolFields index] => this.Fields[(int)index]; + + public string PayloadId + { + get => this.Fields[(int)WixBalBAFunctionsSymbolFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFunctionsSymbolFields.PayloadId, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixBalConditionSymbol.cs b/src/wixext/Symbols/WixBalConditionSymbol.cs new file mode 100644 index 00000000..c2527fbc --- /dev/null +++ b/src/wixext/Symbols/WixBalConditionSymbol.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixBalCondition = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalCondition.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Message), IntermediateFieldType.String), + }, + typeof(WixBalConditionSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixBalConditionSymbolFields + { + Condition, + Message, + } + + public class WixBalConditionSymbol : IntermediateSymbol + { + public WixBalConditionSymbol() : base(BalSymbolDefinitions.WixBalCondition, null, null) + { + } + + public WixBalConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalCondition, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalConditionSymbolFields index] => this.Fields[(int)index]; + + public string Condition + { + get => this.Fields[(int)WixBalConditionSymbolFields.Condition].AsString(); + set => this.Set((int)WixBalConditionSymbolFields.Condition, value); + } + + public string Message + { + get => this.Fields[(int)WixBalConditionSymbolFields.Message].AsString(); + set => this.Set((int)WixBalConditionSymbolFields.Message, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixBalPackageInfoSymbol.cs b/src/wixext/Symbols/WixBalPackageInfoSymbol.cs new file mode 100644 index 00000000..b09cb191 --- /dev/null +++ b/src/wixext/Symbols/WixBalPackageInfoSymbol.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixBalPackageInfo = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalPackageInfo.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.DisplayInternalUICondition), IntermediateFieldType.String), + }, + typeof(WixBalPackageInfoSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixBalPackageInfoSymbolFields + { + PackageId, + DisplayInternalUICondition, + } + + public class WixBalPackageInfoSymbol : IntermediateSymbol + { + public WixBalPackageInfoSymbol() : base(BalSymbolDefinitions.WixBalPackageInfo, null, null) + { + } + + public WixBalPackageInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalPackageInfo, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalPackageInfoSymbolFields index] => this.Fields[(int)index]; + + public string PackageId + { + get => this.Fields[(int)WixBalPackageInfoSymbolFields.PackageId].AsString(); + set => this.Set((int)WixBalPackageInfoSymbolFields.PackageId, value); + } + + public string DisplayInternalUICondition + { + get => this.Fields[(int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition].AsString(); + set => this.Set((int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition, value); + } + } +} diff --git a/src/wixext/Symbols/WixDncOptionsSymbol.cs b/src/wixext/Symbols/WixDncOptionsSymbol.cs new file mode 100644 index 00000000..b9a41c21 --- /dev/null +++ b/src/wixext/Symbols/WixDncOptionsSymbol.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixDncOptions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number), + }, + typeof(WixDncOptionsSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixDncOptionsSymbolFields + { + SelfContainedDeployment, + } + + public class WixDncOptionsSymbol : IntermediateSymbol + { + public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null) + { + } + + public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id) + { + } + + public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index]; + + public int SelfContainedDeployment + { + get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber(); + set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixMbaPrereqInformationSymbol.cs b/src/wixext/Symbols/WixMbaPrereqInformationSymbol.cs new file mode 100644 index 00000000..e4d78da0 --- /dev/null +++ b/src/wixext/Symbols/WixMbaPrereqInformationSymbol.cs @@ -0,0 +1,63 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String), + }, + typeof(WixMbaPrereqInformationSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixMbaPrereqInformationSymbolFields + { + PackageId, + LicenseFile, + LicenseUrl, + } + + public class WixMbaPrereqInformationSymbol : IntermediateSymbol + { + public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null) + { + } + + public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id) + { + } + + public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index]; + + public string PackageId + { + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value); + } + + public string LicenseFile + { + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value); + } + + public string LicenseUrl + { + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixStdbaOptionsSymbol.cs b/src/wixext/Symbols/WixStdbaOptionsSymbol.cs new file mode 100644 index 00000000..cb2694da --- /dev/null +++ b/src/wixext/Symbols/WixStdbaOptionsSymbol.cs @@ -0,0 +1,79 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixStdbaOptions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixStdbaOptions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressOptionsUI), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressDowngradeFailure), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressRepair), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.ShowVersion), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SupportCacheOnly), IntermediateFieldType.Number), + }, + typeof(WixStdbaOptionsSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixStdbaOptionsSymbolFields + { + SuppressOptionsUI, + SuppressDowngradeFailure, + SuppressRepair, + ShowVersion, + SupportCacheOnly, + } + + public class WixStdbaOptionsSymbol : IntermediateSymbol + { + public WixStdbaOptionsSymbol() : base(BalSymbolDefinitions.WixStdbaOptions, null, null) + { + } + + public WixStdbaOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOptions, sourceLineNumber, id) + { + } + + public IntermediateField this[WixStdbaOptionsSymbolFields index] => this.Fields[(int)index]; + + public int SuppressOptionsUI + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressOptionsUI].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressOptionsUI, value); + } + + public int SuppressDowngradeFailure + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure, value); + } + + public int SuppressRepair + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressRepair].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressRepair, value); + } + + public int ShowVersion + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.ShowVersion].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.ShowVersion, value); + } + + public int SupportCacheOnly + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SupportCacheOnly].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs b/src/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs new file mode 100644 index 00000000..1d84d1aa --- /dev/null +++ b/src/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixStdbaOverridableVariable = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixStdbaOverridableVariable.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableSymbolFields.Name), IntermediateFieldType.String), + }, + typeof(WixStdbaOverridableVariableSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixStdbaOverridableVariableSymbolFields + { + Name, + } + + public class WixStdbaOverridableVariableSymbol : IntermediateSymbol + { + public WixStdbaOverridableVariableSymbol() : base(BalSymbolDefinitions.WixStdbaOverridableVariable, null, null) + { + } + + public WixStdbaOverridableVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id) + { + } + + public IntermediateField this[WixStdbaOverridableVariableSymbolFields index] => this.Fields[(int)index]; + + public string Name + { + get => this.Fields[(int)WixStdbaOverridableVariableSymbolFields.Name].AsString(); + set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value); + } + } +} \ No newline at end of file diff --git a/src/wixext/Tuples/BalTupleDefinitions.cs b/src/wixext/Tuples/BalTupleDefinitions.cs deleted file mode 100644 index 90865621..00000000 --- a/src/wixext/Tuples/BalTupleDefinitions.cs +++ /dev/null @@ -1,80 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using System; - using WixToolset.Data; - using WixToolset.Data.Burn; - - public enum BalSymbolDefinitionType - { - WixBalBAFactoryAssembly, - WixBalBAFunctions, - WixBalCondition, - WixBalPackageInfo, - WixDncOptions, - WixMbaPrereqInformation, - WixStdbaOptions, - WixStdbaOverridableVariable, - } - - public static partial class BalSymbolDefinitions - { - public static readonly Version Version = new Version("4.0.0"); - - public static IntermediateSymbolDefinition ByName(string name) - { - if (!Enum.TryParse(name, out BalSymbolDefinitionType type)) - { - return null; - } - - return ByType(type); - } - - public static IntermediateSymbolDefinition ByType(BalSymbolDefinitionType type) - { - switch (type) - { - case BalSymbolDefinitionType.WixBalBAFactoryAssembly: - return BalSymbolDefinitions.WixBalBAFactoryAssembly; - - case BalSymbolDefinitionType.WixBalBAFunctions: - return BalSymbolDefinitions.WixBalBAFunctions; - - case BalSymbolDefinitionType.WixBalCondition: - return BalSymbolDefinitions.WixBalCondition; - - case BalSymbolDefinitionType.WixBalPackageInfo: - return BalSymbolDefinitions.WixBalPackageInfo; - - case BalSymbolDefinitionType.WixDncOptions: - return BalSymbolDefinitions.WixDncOptions; - - case BalSymbolDefinitionType.WixMbaPrereqInformation: - return BalSymbolDefinitions.WixMbaPrereqInformation; - - case BalSymbolDefinitionType.WixStdbaOptions: - return BalSymbolDefinitions.WixStdbaOptions; - - case BalSymbolDefinitionType.WixStdbaOverridableVariable: - return BalSymbolDefinitions.WixStdbaOverridableVariable; - - default: - throw new ArgumentOutOfRangeException(nameof(type)); - } - } - - static BalSymbolDefinitions() - { - WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - } - } -} diff --git a/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs b/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs deleted file mode 100644 index 0423a52f..00000000 --- a/src/wixext/Tuples/WixBalBAFactoryAssemblyTuple.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String), - }, - typeof(WixBalBAFactoryAssemblySymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixBalBAFactorySymbolFields - { - PayloadId, - } - - public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol - { - public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null) - { - } - - public WixBalBAFactoryAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id) - { - } - - public IntermediateField this[WixBalBAFactorySymbolFields index] => this.Fields[(int)index]; - - public string PayloadId - { - get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString(); - set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalBAFunctionsTuple.cs b/src/wixext/Tuples/WixBalBAFunctionsTuple.cs deleted file mode 100644 index 19c7602d..00000000 --- a/src/wixext/Tuples/WixBalBAFunctionsTuple.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixBalBAFunctions = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixBalBAFunctions.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.PayloadId), IntermediateFieldType.String), - }, - typeof(WixBalBAFunctionsSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixBalBAFunctionsSymbolFields - { - PayloadId, - } - - public class WixBalBAFunctionsSymbol : IntermediateSymbol - { - public WixBalBAFunctionsSymbol() : base(BalSymbolDefinitions.WixBalBAFunctions, null, null) - { - } - - public WixBalBAFunctionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFunctions, sourceLineNumber, id) - { - } - - public IntermediateField this[WixBalBAFunctionsSymbolFields index] => this.Fields[(int)index]; - - public string PayloadId - { - get => this.Fields[(int)WixBalBAFunctionsSymbolFields.PayloadId].AsString(); - set => this.Set((int)WixBalBAFunctionsSymbolFields.PayloadId, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalConditionTuple.cs b/src/wixext/Tuples/WixBalConditionTuple.cs deleted file mode 100644 index c2527fbc..00000000 --- a/src/wixext/Tuples/WixBalConditionTuple.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixBalCondition = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixBalCondition.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Condition), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Message), IntermediateFieldType.String), - }, - typeof(WixBalConditionSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixBalConditionSymbolFields - { - Condition, - Message, - } - - public class WixBalConditionSymbol : IntermediateSymbol - { - public WixBalConditionSymbol() : base(BalSymbolDefinitions.WixBalCondition, null, null) - { - } - - public WixBalConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalCondition, sourceLineNumber, id) - { - } - - public IntermediateField this[WixBalConditionSymbolFields index] => this.Fields[(int)index]; - - public string Condition - { - get => this.Fields[(int)WixBalConditionSymbolFields.Condition].AsString(); - set => this.Set((int)WixBalConditionSymbolFields.Condition, value); - } - - public string Message - { - get => this.Fields[(int)WixBalConditionSymbolFields.Message].AsString(); - set => this.Set((int)WixBalConditionSymbolFields.Message, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixBalPackageInfoTuple.cs b/src/wixext/Tuples/WixBalPackageInfoTuple.cs deleted file mode 100644 index b09cb191..00000000 --- a/src/wixext/Tuples/WixBalPackageInfoTuple.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixBalPackageInfo = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixBalPackageInfo.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.PackageId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.DisplayInternalUICondition), IntermediateFieldType.String), - }, - typeof(WixBalPackageInfoSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixBalPackageInfoSymbolFields - { - PackageId, - DisplayInternalUICondition, - } - - public class WixBalPackageInfoSymbol : IntermediateSymbol - { - public WixBalPackageInfoSymbol() : base(BalSymbolDefinitions.WixBalPackageInfo, null, null) - { - } - - public WixBalPackageInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalPackageInfo, sourceLineNumber, id) - { - } - - public IntermediateField this[WixBalPackageInfoSymbolFields index] => this.Fields[(int)index]; - - public string PackageId - { - get => this.Fields[(int)WixBalPackageInfoSymbolFields.PackageId].AsString(); - set => this.Set((int)WixBalPackageInfoSymbolFields.PackageId, value); - } - - public string DisplayInternalUICondition - { - get => this.Fields[(int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition].AsString(); - set => this.Set((int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition, value); - } - } -} diff --git a/src/wixext/Tuples/WixDncOptionsTuple.cs b/src/wixext/Tuples/WixDncOptionsTuple.cs deleted file mode 100644 index b9a41c21..00000000 --- a/src/wixext/Tuples/WixDncOptionsTuple.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixDncOptions.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number), - }, - typeof(WixDncOptionsSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixDncOptionsSymbolFields - { - SelfContainedDeployment, - } - - public class WixDncOptionsSymbol : IntermediateSymbol - { - public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null) - { - } - - public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id) - { - } - - public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index]; - - public int SelfContainedDeployment - { - get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber(); - set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs b/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs deleted file mode 100644 index e4d78da0..00000000 --- a/src/wixext/Tuples/WixMbaPrereqInformationTuple.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String), - }, - typeof(WixMbaPrereqInformationSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixMbaPrereqInformationSymbolFields - { - PackageId, - LicenseFile, - LicenseUrl, - } - - public class WixMbaPrereqInformationSymbol : IntermediateSymbol - { - public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null) - { - } - - public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id) - { - } - - public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index]; - - public string PackageId - { - get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString(); - set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value); - } - - public string LicenseFile - { - get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString(); - set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value); - } - - public string LicenseUrl - { - get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString(); - set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixStdbaOptionsTuple.cs b/src/wixext/Tuples/WixStdbaOptionsTuple.cs deleted file mode 100644 index cb2694da..00000000 --- a/src/wixext/Tuples/WixStdbaOptionsTuple.cs +++ /dev/null @@ -1,79 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixStdbaOptions = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixStdbaOptions.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressOptionsUI), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressDowngradeFailure), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressRepair), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.ShowVersion), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SupportCacheOnly), IntermediateFieldType.Number), - }, - typeof(WixStdbaOptionsSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixStdbaOptionsSymbolFields - { - SuppressOptionsUI, - SuppressDowngradeFailure, - SuppressRepair, - ShowVersion, - SupportCacheOnly, - } - - public class WixStdbaOptionsSymbol : IntermediateSymbol - { - public WixStdbaOptionsSymbol() : base(BalSymbolDefinitions.WixStdbaOptions, null, null) - { - } - - public WixStdbaOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOptions, sourceLineNumber, id) - { - } - - public IntermediateField this[WixStdbaOptionsSymbolFields index] => this.Fields[(int)index]; - - public int SuppressOptionsUI - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressOptionsUI].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressOptionsUI, value); - } - - public int SuppressDowngradeFailure - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure, value); - } - - public int SuppressRepair - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressRepair].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressRepair, value); - } - - public int ShowVersion - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.ShowVersion].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.ShowVersion, value); - } - - public int SupportCacheOnly - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.SupportCacheOnly].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs b/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs deleted file mode 100644 index 1d84d1aa..00000000 --- a/src/wixext/Tuples/WixStdbaOverridableVariableTuple.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixStdbaOverridableVariable = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixStdbaOverridableVariable.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableSymbolFields.Name), IntermediateFieldType.String), - }, - typeof(WixStdbaOverridableVariableSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixStdbaOverridableVariableSymbolFields - { - Name, - } - - public class WixStdbaOverridableVariableSymbol : IntermediateSymbol - { - public WixStdbaOverridableVariableSymbol() : base(BalSymbolDefinitions.WixStdbaOverridableVariable, null, null) - { - } - - public WixStdbaOverridableVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id) - { - } - - public IntermediateField this[WixStdbaOverridableVariableSymbolFields index] => this.Fields[(int)index]; - - public string Name - { - get => this.Fields[(int)WixStdbaOverridableVariableSymbolFields.Name].AsString(); - set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value); - } - } -} \ No newline at end of file -- cgit v1.2.3-55-g6feb From d3988f982c035585590528829149c734c7f13cca Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 27 Jun 2020 01:38:54 -0700 Subject: Build wixlib with WixToolset.Sdk --- appveyor.cmd | 6 +-- global.json | 5 +++ src/FindLocalWix.props | 8 ---- src/dnchost/dnchost.vcxproj | 1 + src/mbahost/mbahost.vcxproj | 2 + src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 2 +- .../WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 2 +- src/wixlib/bal.wixproj | 51 ++++------------------ src/wixlib/packages.config | 5 --- 9 files changed, 21 insertions(+), 61 deletions(-) create mode 100644 global.json delete mode 100644 src/FindLocalWix.props delete mode 100644 src/wixlib/packages.config (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index 95b09f81..a913e969 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -4,13 +4,11 @@ nuget restore || exit /b -msbuild -p:Configuration=%_C% -t:Restore || exit /b - -msbuild -p:Configuration=%_C% || exit /b +msbuild -p:Configuration=%_C% -Restore || exit /b dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b @popd -@endlocal \ No newline at end of file +@endlocal diff --git a/global.json b/global.json new file mode 100644 index 00000000..7a995d0a --- /dev/null +++ b/global.json @@ -0,0 +1,5 @@ +{ + "msbuild-sdks": { + "WixToolset.Sdk": "4.0.0-build-0143" + } +} diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props deleted file mode 100644 index 1666e4fe..00000000 --- a/src/FindLocalWix.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets - - diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 2a45f9ab..80e9a823 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -63,6 +63,7 @@ {0D780900-C2FF-4FA2-8CB5-8A19768724C5} + false true diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 918feaa7..c4045361 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -62,6 +62,8 @@ {f2ba1935-70fa-4156-b161-fd03850b4faa} + false + true diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 5780ca08..a19013f5 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -69,7 +69,7 @@ namespace WixToolsetTest.Bal } } - [Fact] + [Fact(Skip = "Skip test until cycle with Netfx.wixext and this repo is resolved")] public void CantBuildUsingMBAWithNoPrereqs() { using (var fs = new DisposableFileSystem()) diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index f09a19a2..62271029 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -31,7 +31,7 @@ - + diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index c23af015..4d35d516 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,59 +1,26 @@ - - - - + + - {3444D952-F21C-496F-AB6B-56435BFD0787} - bal Library true - true en-us - - - - - - - - - - + + + - + + + - + - - - dnchost - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} - - - mbahost - {12C87C77-3547-44F8-8134-29BC915CB19D} - - - wixstdba - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} - - - - - - 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}. - - - - - diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config deleted file mode 100644 index f37af421..00000000 --- a/src/wixlib/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file -- cgit v1.2.3-55-g6feb From 7dcdcbf3f71159dfee2e4191ac63431859a056d2 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 1 Jul 2020 20:45:30 +1000 Subject: Remove Resources from wixstdba.vcxproj since VS has gotten judgy about wildcards. --- src/wixstdba/wixstdba.vcxproj | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'src') diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 46769531..a4717135 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -48,48 +48,6 @@ - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - WixstdbaResources - - - Wixstdba%(RelativeDir) - -- cgit v1.2.3-55-g6feb From f0fde07fde0b7e786d495982d85e97e926f56ebe Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 1 Jul 2020 21:33:19 +1000 Subject: Update dependencies. --- global.json | 3 +++ src/Samples/bafunctions/bafunctions.vcxproj | 4 ++-- src/Samples/bafunctions/packages.config | 2 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 4 ++-- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 4 ++-- src/dnchost/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 4 ++-- src/mbahost/packages.config | 2 +- src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +- src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 4 ++-- src/test/examples/TestEngine/packages.config | 2 +- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/wixstdba/packages.config | 2 +- src/wixstdba/wixstdba.vcxproj | 4 ++-- 18 files changed, 26 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 7a995d0a..242b4a49 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,8 @@ { "msbuild-sdks": { "WixToolset.Sdk": "4.0.0-build-0143" + }, + "sdk": { + "allowPrerelease": false } } diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index d35c85c0..7355cf0f 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,7 +2,7 @@ - + @@ -57,7 +57,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}. - + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 65e7225a..bfbf59dd 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 3fedba03..6bbdf63a 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -1,4 +1,4 @@ - + @@ -48,7 +48,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.31\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.32\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 829c7898..c551d4a4 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 80e9a823..cda2b2f3 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,7 +4,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 62f52e92..086c071e 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index c4045361..8f84f1cd 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,7 +5,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 660d3b9a..6fd987cb 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index b2c7dd29..a2d7ea6d 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 958047b0..0b1dff31 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -15,6 +15,6 @@ - + \ 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 1f61d9d1..2405d28d 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index dc2b8a5f..bebce2f9 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 7fb3b3aa..721f2263 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,7 +1,7 @@ - + @@ -68,7 +68,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}. - + diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index 65e7225a..bfbf59dd 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -2,6 +2,6 @@ - + \ 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 393b403e..12ca0d13 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 660d3b9a..6fd987cb 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index a4717135..cb34c6ef 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,7 +5,7 @@ - + @@ -78,7 +78,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - + -- cgit v1.2.3-55-g6feb From 992ca1b24e981fa42eab8cbd8e170819deb34ea7 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 1 Jul 2020 21:38:54 +1000 Subject: Update wixstdba to show theme load errors. --- src/wixstdba/wixstdba.cpp | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) (limited to 'src') diff --git a/src/wixstdba/wixstdba.cpp b/src/wixstdba/wixstdba.cpp index 727c8cb0..a96f1738 100644 --- a/src/wixstdba/wixstdba.cpp +++ b/src/wixstdba/wixstdba.cpp @@ -5,6 +5,16 @@ static HINSTANCE vhInstance = NULL; static IBootstrapperApplication* vpApplication = NULL; +static void CALLBACK WixstdbaTraceError( + __in_z LPCSTR szFile, + __in int iLine, + __in REPORT_LEVEL rl, + __in UINT source, + __in HRESULT hrError, + __in_z __format_string LPCSTR szFormat, + __in va_list args + ); + extern "C" BOOL WINAPI DllMain( IN HINSTANCE hInstance, IN DWORD dwReason, @@ -35,6 +45,8 @@ extern "C" HRESULT WINAPI BootstrapperApplicationCreate( HRESULT hr = S_OK; IBootstrapperEngine* pEngine = NULL; + DutilInitialize(&WixstdbaTraceError); + hr = BalInitializeFromCreateArgs(pArgs, &pEngine); ExitOnFailure(hr, "Failed to initialize Bal."); @@ -52,6 +64,7 @@ extern "C" void WINAPI BootstrapperApplicationDestroy() { ReleaseNullObject(vpApplication); BalUninitialize(); + DutilUninitialize(); } @@ -64,6 +77,8 @@ extern "C" HRESULT WINAPI DncPrereqBootstrapperApplicationCreate( { HRESULT hr = S_OK; + DutilInitialize(&WixstdbaTraceError); + BalInitialize(pEngine); hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication); @@ -78,6 +93,7 @@ extern "C" void WINAPI DncPrereqBootstrapperApplicationDestroy() { ReleaseNullObject(vpApplication); BalUninitialize(); + DutilUninitialize(); } @@ -90,6 +106,8 @@ extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate( { HRESULT hr = S_OK; + DutilInitialize(&WixstdbaTraceError); + BalInitialize(pEngine); hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication); @@ -104,4 +122,23 @@ extern "C" void WINAPI MbaPrereqBootstrapperApplicationDestroy() { ReleaseNullObject(vpApplication); BalUninitialize(); + DutilUninitialize(); +} + +static void CALLBACK WixstdbaTraceError( + __in_z LPCSTR /*szFile*/, + __in int /*iLine*/, + __in REPORT_LEVEL /*rl*/, + __in UINT source, + __in HRESULT hrError, + __in_z __format_string LPCSTR szFormat, + __in va_list args + ) +{ + // BalLogError currently uses the Exit... macros, + // so if expanding the scope need to ensure this doesn't get called recursively. + if (DUTIL_SOURCE_THMUTIL == source) + { + BalLogErrorArgs(hrError, szFormat, args); + } } -- cgit v1.2.3-55-g6feb From 4f563d90569c9e87faa6d82925a02b834ddd32c5 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 6 Jul 2020 22:07:14 +1000 Subject: Update to latest thmutil. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 4 ++-- src/Samples/bafunctions/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 4 ++-- src/dnchost/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 4 ++-- src/mbahost/packages.config | 2 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 4 ++-- src/test/examples/TestEngine/packages.config | 2 +- .../WixStandardBootstrapperApplication.cpp | 22 ++++++---------------- src/wixstdba/packages.config | 2 +- src/wixstdba/wixstdba.vcxproj | 4 ++-- 12 files changed, 22 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 242b4a49..e610ffdd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0143" + "WixToolset.Sdk": "4.0.0-build-0144" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 7355cf0f..7312e802 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -4,7 +4,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index bfbf59dd..4642439f 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index cda2b2f3..a130bd05 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -6,7 +6,7 @@ - + Debug @@ -85,6 +85,6 @@ - + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 086c071e..29cc1384 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 8f84f1cd..2b5b2ce7 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -7,7 +7,7 @@ - + @@ -85,6 +85,6 @@ - + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 6fd987cb..5020bdb5 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -6,5 +6,5 @@ - + \ 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 721f2263..17b76fe9 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -3,7 +3,7 @@ - + Debug @@ -70,6 +70,6 @@ - + \ No newline at end of file diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index bfbf59dd..4642439f 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -3,5 +3,5 @@ - + \ No newline at end of file diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index dd7ad229..8d07c760 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -2300,8 +2300,6 @@ private: // privates int x = CW_USEDEFAULT; int y = CW_USEDEFAULT; POINT ptCursor = { }; - HMONITOR hMonitor = NULL; - MONITORINFO mi = { }; // If the theme did not provide an icon, try using the icon from the bundle engine. if (!hIcon) @@ -2344,20 +2342,12 @@ private: // privates // Center the window on the monitor with the mouse. if (::GetCursorPos(&ptCursor)) { - hMonitor = ::MonitorFromPoint(ptCursor, MONITOR_DEFAULTTONEAREST); - if (hMonitor) - { - mi.cbSize = sizeof(mi); - if (::GetMonitorInfoW(hMonitor, &mi)) - { - x = mi.rcWork.left + (mi.rcWork.right - mi.rcWork.left - m_pTheme->nWidth) / 2; - y = mi.rcWork.top + (mi.rcWork.bottom - mi.rcWork.top - m_pTheme->nHeight) / 2; - } - } + x = ptCursor.x; + y = ptCursor.y; } - m_hWnd = ::CreateWindowExW(0, wc.lpszClassName, m_pTheme->sczCaption, dwWindowStyle, x, y, m_pTheme->nWidth, m_pTheme->nHeight, HWND_DESKTOP, NULL, m_hModule, this); - ExitOnNullWithLastError(m_hWnd, hr, "Failed to create window."); + hr = ThemeCreateParentWindow(m_pTheme, 0, wc.lpszClassName, m_pTheme->sczCaption, dwWindowStyle, x, y, HWND_DESKTOP, m_hModule, this, THEME_WINDOW_INITIAL_POSITION_CENTER_MONITOR_FROM_COORDINATES, &m_hWnd); + ExitOnFailure(hr, "Failed to create window."); hr = S_OK; @@ -2601,7 +2591,7 @@ private: // privates // OnCreate - finishes loading the theme. // BOOL OnCreate( - __in HWND hWnd + __in HWND /*hWnd*/ ) { HRESULT hr = S_OK; @@ -2612,7 +2602,7 @@ private: // privates BA_FUNCTIONS_ONTHEMELOADED_ARGS themeLoadedArgs = { }; BA_FUNCTIONS_ONTHEMELOADED_RESULTS themeLoadedResults = { }; - hr = ThemeLoadControls(m_pTheme, hWnd, vrgInitControls, countof(vrgInitControls)); + hr = ThemeLoadControls(m_pTheme, vrgInitControls, countof(vrgInitControls)); BalExitOnFailure(hr, "Failed to load theme controls."); C_ASSERT(COUNT_WIXSTDBA_PAGE == countof(vrgwzPageNames)); diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 6fd987cb..5020bdb5 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index cb34c6ef..0d0ef073 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -7,7 +7,7 @@ - + @@ -80,6 +80,6 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From ab7e604a7d7b53f288b81a603c0dce1fc5c8e048 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 19 Jul 2020 18:27:06 +1000 Subject: Update dependencies. --- global.json | 2 +- nuget.config | 1 - src/Samples/bafunctions/bafunctions.vcxproj | 12 ++++++------ src/Samples/bafunctions/packages.config | 6 +++--- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 12 ++++++------ src/dnchost/packages.config | 6 +++--- src/mbahost/mbahost.vcxproj | 12 ++++++------ src/mbahost/packages.config | 6 +++--- src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 1 + .../examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 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/packages.config | 6 +++--- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/wixlib/bal.wixproj | 1 + src/wixstdba/packages.config | 6 +++--- src/wixstdba/wixstdba.vcxproj | 12 ++++++------ 21 files changed, 55 insertions(+), 54 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index e610ffdd..41935656 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0144" + "WixToolset.Sdk": "4.0.0-build-0149" }, "sdk": { "allowPrerelease": false diff --git a/nuget.config b/nuget.config index 84834350..f3277bc4 100644 --- a/nuget.config +++ b/nuget.config @@ -8,7 +8,6 @@ - diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 7312e802..e1e83dbe 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -57,9 +57,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 4642439f..34e10a05 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 6bbdf63a..42e07501 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -48,7 +48,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.32\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.33\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index c551d4a4..500dc72d 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index a130bd05..a278d714 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -83,8 +83,8 @@ - - - + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 29cc1384..e0396349 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -5,7 +5,7 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 2b5b2ce7..575187b4 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -83,8 +83,8 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 5020bdb5..f3c6255c 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 62271029..3c742604 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -31,6 +31,7 @@ + diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index a2d7ea6d..a7983a16 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 0b1dff31..5b7e2c0a 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -15,6 +15,6 @@ - + \ 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 2405d28d..6ff0cfda 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index bebce2f9..8016ad15 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 17b76fe9..4890f609 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/packages.config b/src/test/examples/TestEngine/packages.config index 4642439f..34e10a05 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 12ca0d13..d99e1ba3 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 4d35d516..5c743cd9 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -11,6 +11,7 @@ + diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 5020bdb5..f3c6255c 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 0d0ef073..b3400e35 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -78,8 +78,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 71802ec02bae5f882ca3cd894abc202d63da9440 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 22 Jul 2020 18:12:23 +1000 Subject: Fix ManagedHost tests by using Heat to harvest the BA payloads. Also, build all example bundles in the new examples.proj instead of the tests to speed up the solution build. --- appveyor.cmd | 3 + .../WixToolsetTest.ManagedHost/DncHostFixture.cs | 178 ++-------------- .../HarvestDirectoryToPayloadGroup.ps1 | 42 ---- .../WixToolsetTest.ManagedHost/MbaHostFixture.cs | 74 +------ src/test/WixToolsetTest.ManagedHost/README.md | 5 + .../EarliestCoreMBA/FrameworkDependentBundle.wxs | 17 -- .../TestData/EarliestCoreMBA/HarvestedSCD.wxs | 235 --------------------- .../EarliestCoreMBA/HarvestedTrimmedSCD.wxs | 113 ---------- .../EarliestCoreMBA/SelfContainedBundle.wxs | 13 -- .../EarliestCoreMBA/TrimmedSelfContainedBundle.wxs | 13 -- .../TestData/FullFramework2MBA/Bundle.wxs | 15 -- .../TestData/FullFramework4MBA/Bundle.wxs | 15 -- .../LatestCoreMBA/FrameworkDependentBundle.wxs | 17 -- .../TestData/LatestCoreMBA/HarvestedSCD.wxs | 235 --------------------- .../TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs | 113 ---------- .../TestData/LatestCoreMBA/SelfContainedBundle.wxs | 13 -- .../LatestCoreMBA/TrimmedSelfContainedBundle.wxs | 13 -- .../WPFCoreMBA/FrameworkDependentBundle.wxs | 17 -- .../WixToolsetTest.ManagedHost.csproj | 57 ----- src/test/examples/Directory.Build.props | 6 + src/test/examples/Directory.Build.targets | 6 + .../EarliestCoreBundleFDD.wixproj | 2 + .../FrameworkDependentBundle.wxs | 17 ++ .../EarliestCoreBundleSCD.wixproj | 10 + .../EarliestCoreBundleSCD/SelfContainedBundle.wxs | 13 ++ src/test/examples/EarliestCoreBundleSCD/ba.xslt | 20 ++ .../EarliestCoreBundleTrimmedSCD.wixproj | 10 + .../TrimmedSelfContainedBundle.wxs | 13 ++ .../examples/EarliestCoreBundleTrimmedSCD/ba.xslt | 20 ++ src/test/examples/FullFramework2Bundle/Bundle.wxs | 15 ++ .../FullFramework2Bundle.wixproj | 2 + src/test/examples/FullFramework4Bundle/Bundle.wxs | 15 ++ .../FullFramework4Bundle.wixproj | 2 + .../FrameworkDependentBundle.wxs | 17 ++ .../LatestCoreBundleFDD.wixproj | 2 + .../LatestCoreBundleSCD.wixproj | 10 + .../LatestCoreBundleSCD/SelfContainedBundle.wxs | 13 ++ src/test/examples/LatestCoreBundleSCD/ba.xslt | 20 ++ .../LatestCoreBundleTrimmedSCD.wixproj | 10 + .../TrimmedSelfContainedBundle.wxs | 13 ++ .../examples/LatestCoreBundleTrimmedSCD/ba.xslt | 20 ++ .../WPFCoreBundleFDD/FrameworkDependentBundle.wxs | 17 ++ .../WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj | 2 + src/test/examples/Wix.Build.props | 10 + src/test/examples/Wix.Build.targets | 8 + src/test/examples/examples.proj | 50 +++++ 46 files changed, 369 insertions(+), 1162 deletions(-) delete mode 100644 src/test/WixToolsetTest.ManagedHost/HarvestDirectoryToPayloadGroup.ps1 create mode 100644 src/test/WixToolsetTest.ManagedHost/README.md delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/FrameworkDependentBundle.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/FrameworkDependentBundle.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs create mode 100644 src/test/examples/Directory.Build.props create mode 100644 src/test/examples/Directory.Build.targets create mode 100644 src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj create mode 100644 src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs create mode 100644 src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj create mode 100644 src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs create mode 100644 src/test/examples/EarliestCoreBundleSCD/ba.xslt create mode 100644 src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj create mode 100644 src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs create mode 100644 src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt create mode 100644 src/test/examples/FullFramework2Bundle/Bundle.wxs create mode 100644 src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj create mode 100644 src/test/examples/FullFramework4Bundle/Bundle.wxs create mode 100644 src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj create mode 100644 src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs create mode 100644 src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj create mode 100644 src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj create mode 100644 src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs create mode 100644 src/test/examples/LatestCoreBundleSCD/ba.xslt create mode 100644 src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj create mode 100644 src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs create mode 100644 src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt create mode 100644 src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs create mode 100644 src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj create mode 100644 src/test/examples/Wix.Build.props create mode 100644 src/test/examples/Wix.Build.targets create mode 100644 src/test/examples/examples.proj (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index a913e969..fe525614 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -5,7 +5,10 @@ nuget restore || exit /b msbuild -p:Configuration=%_C% -Restore || exit /b +msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b + dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b +dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs index a2a9a107..af5f2543 100644 --- a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs @@ -9,28 +9,15 @@ namespace WixToolsetTest.ManagedHost public class DncHostFixture { + static readonly string bundleBasePath = TestData.Get("..", "examples"); + [Fact] public void CanLoadFDDEarliestCoreMBA() { using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "FDDEarliestCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\EarliestCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleFDD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); @@ -48,23 +35,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "SCDEarliestCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\EarliestCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "SelfContainedBundle.wxs"), - Path.Combine(bundleSourceFolder, "HarvestedSCD.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleSCD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); @@ -82,23 +53,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "TrimmedSCDEarliestCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\EarliestCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "TrimmedSelfContainedBundle.wxs"), - Path.Combine(bundleSourceFolder, "HarvestedTrimmedSCD.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleTrimmedSCD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); @@ -116,23 +71,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "SCDEarliestCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\EarliestCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "SelfContainedBundle.wxs"), - Path.Combine(bundleSourceFolder, "HarvestedSCD.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleSCD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunReloadEngine(bundleFile, baseFolder); @@ -155,22 +94,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "FDDLatestCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); @@ -188,22 +112,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "FDDLatestCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunReloadEngine(bundleFile, baseFolder); @@ -226,23 +135,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "SCDLatestCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "SelfContainedBundle.wxs"), - Path.Combine(bundleSourceFolder, "HarvestedSCD.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleSCD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); @@ -260,23 +153,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "TrimmedSCDLatestCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "TrimmedSelfContainedBundle.wxs"), - Path.Combine(bundleSourceFolder, "HarvestedTrimmedSCD.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleTrimmedSCD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); @@ -294,23 +171,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "SCDLatestCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\LatestCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "SelfContainedBundle.wxs"), - Path.Combine(bundleSourceFolder, "HarvestedSCD.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleSCD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunReloadEngine(bundleFile, baseFolder); @@ -333,22 +194,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "FDDWPFCoreMBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\WPFCoreMBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "FrameworkDependentBundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "WPFCoreBundleFDD.exe"); var testEngine = new TestEngine(); var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); diff --git a/src/test/WixToolsetTest.ManagedHost/HarvestDirectoryToPayloadGroup.ps1 b/src/test/WixToolsetTest.ManagedHost/HarvestDirectoryToPayloadGroup.ps1 deleted file mode 100644 index 928470b0..00000000 --- a/src/test/WixToolsetTest.ManagedHost/HarvestDirectoryToPayloadGroup.ps1 +++ /dev/null @@ -1,42 +0,0 @@ -param([string]$RootFolder, [string]$HarvestFolder, [string]$OutputFile) - -function harvestFileToPayload { - param([System.IO.FileInfo]$file, [string]$rootFolder, [string]$harvestFolder) - - $sourceFile = $file.FullName.Substring($rootFolder.Length + 1) - $name = $sourceFile.Substring($harvestFolder.Length + 1) - $payloadContents = "" - $payloadContents -} - -function harvestDirectoryToPayloadGroup { - param([string]$rootFolder, [string]$harvestFolder, [string]$outputFile) - - $beginFileContents = @" - - - - " + [System.Environment]::NewLine - - $targetFolder = [System.IO.Path]::Combine($rootFolder, $harvestFolder) - Get-ChildItem -Path $targetFolder -Recurse -File | ForEach-Object { - $fileContents += ' ' + (harvestFileToPayload -file $_ -rootFolder $rootFolder -harvestFolder $harvestFolder) + [System.Environment]::NewLine - } - - $fileContents += $endFileContents - - [System.IO.File]::WriteAllText($outputFile, $fileContents) -} - -harvestDirectoryToPayloadGroup -rootFolder $RootFolder -harvestFolder $HarvestFolder -outputFile $OutputFile \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs index 45b3e9d0..dd37ee58 100644 --- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs +++ b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs @@ -9,29 +9,15 @@ namespace WixToolsetTest.ManagedHost public class MbaHostFixture { + static readonly string bundleBasePath = TestData.Get("..", "examples"); + [Fact] public void CanLoadFullFramework2MBA() { using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "FullFramework2MBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\FullFramework2MBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "FullFramework2Bundle.exe"); var testEngine = new TestEngine(); var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); @@ -49,23 +35,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "FullFramework4MBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\FullFramework4MBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "FullFramework4Bundle.exe"); var testEngine = new TestEngine(); var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); @@ -83,23 +53,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "FullFramework2MBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\FullFramework2MBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "FullFramework2Bundle.exe"); var testEngine = new TestEngine(); var result = testEngine.RunReloadEngine(bundleFile, baseFolder); @@ -121,23 +75,7 @@ namespace WixToolsetTest.ManagedHost using (var fs = new DisposableFileSystem()) { var baseFolder = fs.GetFolder(); - var binFolder = Path.Combine(baseFolder, "bin"); - var bundleFile = Path.Combine(binFolder, "FullFramework4MBA.exe"); - var baSourceFolder = TestData.Get(@"..\examples"); - var bundleSourceFolder = TestData.Get(@"TestData\FullFramework4MBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", baSourceFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); + var bundleFile = TestData.Get(bundleBasePath, "FullFramework4Bundle.exe"); var testEngine = new TestEngine(); var result = testEngine.RunReloadEngine(bundleFile, baseFolder); diff --git a/src/test/WixToolsetTest.ManagedHost/README.md b/src/test/WixToolsetTest.ManagedHost/README.md new file mode 100644 index 00000000..d7e73df2 --- /dev/null +++ b/src/test/WixToolsetTest.ManagedHost/README.md @@ -0,0 +1,5 @@ +In order to properly test dnchost and mbahost, +the managed BAs need to be published and a bundle needs to be built for each scenario. +Making this happen on every build for the solution takes too long, +so this project relies on manually running appveyor.cmd to publish everything before the tests can be run. +appveyor.cmd needs to be ran again every time changes are made in other projects. \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/FrameworkDependentBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/FrameworkDependentBundle.wxs deleted file mode 100644 index 5cec494d..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/FrameworkDependentBundle.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs deleted file mode 100644 index 6699b094..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedSCD.wxs +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs deleted file mode 100644 index 7eb56061..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/HarvestedTrimmedSCD.wxs +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs deleted file mode 100644 index d951ffc6..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/SelfContainedBundle.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs deleted file mode 100644 index 816524ed..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/EarliestCoreMBA/TrimmedSelfContainedBundle.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs deleted file mode 100644 index f5999c98..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework2MBA/Bundle.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs deleted file mode 100644 index ae27457f..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/FullFramework4MBA/Bundle.wxs +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/FrameworkDependentBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/FrameworkDependentBundle.wxs deleted file mode 100644 index 22fb3d8b..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/FrameworkDependentBundle.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs deleted file mode 100644 index 35373631..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedSCD.wxs +++ /dev/null @@ -1,235 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs deleted file mode 100644 index 9076d2e6..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/HarvestedTrimmedSCD.wxs +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs deleted file mode 100644 index 4b0fe38a..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/SelfContainedBundle.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs deleted file mode 100644 index eee87933..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/LatestCoreMBA/TrimmedSelfContainedBundle.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs b/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs deleted file mode 100644 index ecc5e8c1..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestData/WPFCoreMBA/FrameworkDependentBundle.wxs +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index d446d3a1..6542e77f 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -4,62 +4,14 @@ netcoreapp3.1 - false NU1701 - - ..\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj - ..\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj - ..\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj - $(OutputPath)examples\publish\ - - - - - - - - - - - - - - - - - - - - - - - - $(MBAPublishPath)Example.EarliestCoreMBA - - - $(MBAPublishPath)Example.LatestCoreMBA - - - $(MBAPublishPath)Example.WPFCoreMBA - true - true - - - - - - - - - - @@ -74,13 +26,4 @@ - - - - - - diff --git a/src/test/examples/Directory.Build.props b/src/test/examples/Directory.Build.props new file mode 100644 index 00000000..3d5870a5 --- /dev/null +++ b/src/test/examples/Directory.Build.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/test/examples/Directory.Build.targets b/src/test/examples/Directory.Build.targets new file mode 100644 index 00000000..6dcf402b --- /dev/null +++ b/src/test/examples/Directory.Build.targets @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj b/src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..5cec494d --- /dev/null +++ b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj new file mode 100644 index 00000000..ebeebff2 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.EarliestCoreMBA.scd + ba.xslt + + + diff --git a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs new file mode 100644 index 00000000..d951ffc6 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/examples/EarliestCoreBundleSCD/ba.xslt b/src/test/examples/EarliestCoreBundleSCD/ba.xslt new file mode 100644 index 00000000..06b84256 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj b/src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj new file mode 100644 index 00000000..a6b56460 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.EarliestCoreMBA.trimmedscd + ba.xslt + + + diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs new file mode 100644 index 00000000..816524ed --- /dev/null +++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt b/src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt new file mode 100644 index 00000000..06b84256 --- /dev/null +++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/test/examples/FullFramework2Bundle/Bundle.wxs b/src/test/examples/FullFramework2Bundle/Bundle.wxs new file mode 100644 index 00000000..c95631db --- /dev/null +++ b/src/test/examples/FullFramework2Bundle/Bundle.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj b/src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/FullFramework4Bundle/Bundle.wxs b/src/test/examples/FullFramework4Bundle/Bundle.wxs new file mode 100644 index 00000000..be0be131 --- /dev/null +++ b/src/test/examples/FullFramework4Bundle/Bundle.wxs @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + diff --git a/src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj b/src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..22fb3d8b --- /dev/null +++ b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj b/src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj new file mode 100644 index 00000000..30a860ab --- /dev/null +++ b/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.LatestCoreMBA.scd + ba.xslt + + + diff --git a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs new file mode 100644 index 00000000..4b0fe38a --- /dev/null +++ b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/examples/LatestCoreBundleSCD/ba.xslt b/src/test/examples/LatestCoreBundleSCD/ba.xslt new file mode 100644 index 00000000..acc7474c --- /dev/null +++ b/src/test/examples/LatestCoreBundleSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj b/src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj new file mode 100644 index 00000000..5ce89b64 --- /dev/null +++ b/src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.LatestCoreMBA.trimmedscd + ba.xslt + + + diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs new file mode 100644 index 00000000..eee87933 --- /dev/null +++ b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt b/src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt new file mode 100644 index 00000000..acc7474c --- /dev/null +++ b/src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..ecc5e8c1 --- /dev/null +++ b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + diff --git a/src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj b/src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/test/examples/Wix.Build.props b/src/test/examples/Wix.Build.props new file mode 100644 index 00000000..aad94bb6 --- /dev/null +++ b/src/test/examples/Wix.Build.props @@ -0,0 +1,10 @@ + + + + + Bundle + .exe + -generate payloadgroup + $(OutputPath)examples\ + + diff --git a/src/test/examples/Wix.Build.targets b/src/test/examples/Wix.Build.targets new file mode 100644 index 00000000..7e6fe9f2 --- /dev/null +++ b/src/test/examples/Wix.Build.targets @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/test/examples/examples.proj b/src/test/examples/examples.proj new file mode 100644 index 00000000..08cb7511 --- /dev/null +++ b/src/test/examples/examples.proj @@ -0,0 +1,50 @@ + + + + + + + + + EarliestCoreMBA\Example.EarliestCoreMBA.csproj + FullFramework2MBA\Example.FullFramework2MBA.csproj + FullFramework4MBA\Example.FullFramework4MBA.csproj + LatestCoreMBA\Example.LatestCoreMBA.csproj + WPFCoreMBA\Example.WPFCoreMBA.csproj + $(OutputPath)examples\publish\ + + + + + $(MBAPublishPath)Example.EarliestCoreMBA + + + $(MBAPublishPath)Example.LatestCoreMBA + + + $(MBAPublishPath)Example.WPFCoreMBA + true + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 70b5d207d799308a6c3742f5d0348ab4fca75a3d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 22 Jul 2020 18:39:50 +1000 Subject: Upgrade DotNetAppHost package to .NET 5 to use its static nethost lib and headers. --- src/dnchost/dnchost.vcxproj | 9 +---- src/dnchost/hostfxr.h | 96 --------------------------------------------- src/dnchost/packages.config | 2 +- src/dnchost/precomp.h | 3 +- src/wixlib/Dnc.wxs | 1 - 5 files changed, 5 insertions(+), 106 deletions(-) delete mode 100644 src/dnchost/hostfxr.h (limited to 'src') diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index a278d714..f9a2546f 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -28,8 +28,8 @@ - ..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.3.1.3\runtimes\win-x86\native\ - shlwapi.lib;$(NetHostPath)nethost.lib + ..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0-preview.7.20364.11\runtimes\win-x86\native\ + shlwapi.lib;$(NetHostPath)libnethost.lib @@ -42,7 +42,6 @@ - @@ -50,10 +49,6 @@ - - PreserveNewest - False - diff --git a/src/dnchost/hostfxr.h b/src/dnchost/hostfxr.h deleted file mode 100644 index 85e6e0ab..00000000 --- a/src/dnchost/hostfxr.h +++ /dev/null @@ -1,96 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - - - -// ***** ABOUT THIS HEADER ***** -// ************************************************************************************** -// -// This is the version on 2019-12-22 from -// https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/hostfxr.h -// -// ************************************************************************************** -// **************************** - - -#ifndef __HOSTFXR_H__ -#define __HOSTFXR_H__ - -#include -#include - -#if defined(_WIN32) - #define HOSTFXR_CALLTYPE __cdecl - #ifdef _WCHAR_T_DEFINED - typedef wchar_t char_t; - #else - typedef unsigned short char_t; - #endif -#else - #define HOSTFXR_CALLTYPE - typedef char char_t; -#endif - -enum hostfxr_delegate_type -{ - hdt_com_activation, - hdt_load_in_memory_assembly, - hdt_winrt_activation, - hdt_com_register, - hdt_com_unregister, - hdt_load_assembly_and_get_function_pointer -}; - -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_main_fn)(const int argc, const char_t **argv); -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_main_startupinfo_fn)( - const int argc, - const char_t **argv, - const char_t *host_path, - const char_t *dotnet_root, - const char_t *app_path); - -typedef void(HOSTFXR_CALLTYPE *hostfxr_error_writer_fn)(const char_t *message); -typedef hostfxr_error_writer_fn(HOSTFXR_CALLTYPE *hostfxr_set_error_writer_fn)(hostfxr_error_writer_fn error_writer); - -typedef void* hostfxr_handle; -struct hostfxr_initialize_parameters -{ - size_t size; - const char_t *host_path; - const char_t *dotnet_root; -}; - -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_initialize_for_dotnet_command_line_fn)( - int argc, - const char_t **argv, - const struct hostfxr_initialize_parameters *parameters, - /*out*/ hostfxr_handle *host_context_handle); -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_initialize_for_runtime_config_fn)( - const char_t *runtime_config_path, - const struct hostfxr_initialize_parameters *parameters, - /*out*/ hostfxr_handle *host_context_handle); - -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_get_runtime_property_value_fn)( - const hostfxr_handle host_context_handle, - const char_t *name, - /*out*/ const char_t **value); -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_set_runtime_property_value_fn)( - const hostfxr_handle host_context_handle, - const char_t *name, - const char_t *value); -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_get_runtime_properties_fn)( - const hostfxr_handle host_context_handle, - /*inout*/ size_t * count, - /*out*/ const char_t **keys, - /*out*/ const char_t **values); - -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_run_app_fn)(const hostfxr_handle host_context_handle); -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_get_runtime_delegate_fn)( - const hostfxr_handle host_context_handle, - enum hostfxr_delegate_type type, - /*out*/ void **delegate); - -typedef int32_t(HOSTFXR_CALLTYPE *hostfxr_close_fn)(const hostfxr_handle host_context_handle); - -#endif //__HOSTFXR_H__ \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index e0396349..dfeefbc4 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/dnchost/precomp.h b/src/dnchost/precomp.h index 6a12ef67..d19a0780 100644 --- a/src/dnchost/precomp.h +++ b/src/dnchost/precomp.h @@ -21,9 +21,10 @@ #include #include +#define NETHOST_USE_AS_STATIC #include +#include #include "coreclrhost.h" -#include "hostfxr.h" #include "dncutil.h" #include "dnchost.h" diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs index 2a27050f..2663360f 100644 --- a/src/wixlib/Dnc.wxs +++ b/src/wixlib/Dnc.wxs @@ -40,7 +40,6 @@ - -- cgit v1.2.3-55-g6feb From d96ba4263bf243dedb62e9090072fba53bfe1316 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 22 Jul 2020 19:55:20 +1000 Subject: Use hdt_get_function_pointer in dnchost when available. --- .../BootstrapperApplicationFactory.cs | 2 + src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 3 ++ src/dnchost/dncutil.cpp | 61 +++++++++++++++++++--- src/dnchost/dncutil.h | 2 + src/dnchost/precomp.h | 1 + 5 files changed, 61 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs b/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs index 0c6ea367..d38fd1a9 100644 --- a/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs +++ b/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs @@ -7,6 +7,8 @@ namespace WixToolset.Dnc.Host using System.Reflection; using System.Runtime.InteropServices; + delegate IBootstrapperApplicationFactory StaticEntryDelegate([MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyName, [MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyPath); + /// /// Entry point for the .NET Core host to create and return the BA to the engine. /// Reflection is used instead of referencing WixToolset.Mba.Core directly to avoid requiring it in the AssemblyLoadContext. diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index 495b13a2..707edd1b 100644 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -24,7 +24,10 @@ + + + diff --git a/src/dnchost/dncutil.cpp b/src/dnchost/dncutil.cpp index 996bf086..4a82d961 100644 --- a/src/dnchost/dncutil.cpp +++ b/src/dnchost/dncutil.cpp @@ -3,7 +3,9 @@ #include "precomp.h" // https://github.com/dotnet/runtime/blob/master/src/installer/corehost/error_codes.h +#define InvalidArgFailure 0x80008081 #define HostApiBufferTooSmall 0x80008098 +#define HostApiUnsupportedVersion 0x800080a2 // internal function declarations @@ -24,6 +26,10 @@ static HRESULT InitializeCoreClr( __in HOSTFXR_STATE* pState, __in LPCWSTR wzNativeHostPath ); +static HRESULT InitializeCoreClrPre5( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ); static HRESULT LoadCoreClr( __in HOSTFXR_STATE* pState, __in LPCWSTR wzCoreClrPath @@ -75,14 +81,28 @@ HRESULT DnchostCreateFactory( HRESULT hr = S_OK; PFNCREATEBAFACTORY pfnCreateBAFactory = NULL; - hr = pState->pfnCoreclrCreateDelegate( - pState->pClrHandle, - pState->dwDomainId, - DNC_ASSEMBLY_FULL_NAME, - DNC_ENTRY_TYPE, - DNC_STATIC_ENTRY_METHOD, - reinterpret_cast(&pfnCreateBAFactory)); - BalExitOnFailure(hr, "Failed to create delegate in app domain."); + if (pState->pfnGetFunctionPointer) + { + hr = pState->pfnGetFunctionPointer( + DNC_ENTRY_TYPEW, + DNC_STATIC_ENTRY_METHODW, + DNC_STATIC_ENTRY_DELEGATEW, + NULL, + NULL, + reinterpret_cast(&pfnCreateBAFactory)); + BalExitOnFailure(hr, "Failed to create delegate through GetFunctionPointer."); + } + else + { + hr = pState->pfnCoreclrCreateDelegate( + pState->pClrHandle, + pState->dwDomainId, + DNC_ASSEMBLY_FULL_NAME, + DNC_ENTRY_TYPE, + DNC_STATIC_ENTRY_METHOD, + reinterpret_cast(&pfnCreateBAFactory)); + BalExitOnFailure(hr, "Failed to create delegate in app domain."); + } *ppAppFactory = pfnCreateBAFactory(wzBaFactoryAssemblyName, wzBaFactoryAssemblyPath); @@ -149,6 +169,9 @@ static HRESULT LoadHostfxr( pState->pfnHostfxrClose = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_close")); BalExitOnNullWithLastError(pState->pfnHostfxrClose, hr, "Failed to get procedure address for hostfxr_close."); + pState->pfnHostfxrGetRuntimeDelegate = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_get_runtime_delegate")); + BalExitOnNullWithLastError(pState->pfnHostfxrGetRuntimeDelegate, hr, "Failed to get procedure address for hostfxr_get_runtime_delegate."); + LExit: // Never unload the module since it isn't meant to be unloaded. @@ -194,6 +217,28 @@ static HRESULT InitializeCoreClr( ) { HRESULT hr = S_OK; + + hr = pState->pfnHostfxrGetRuntimeDelegate(pState->hostContextHandle, hdt_get_function_pointer, reinterpret_cast(&pState->pfnGetFunctionPointer)); + if (InvalidArgFailure == hr || // old versions of hostfxr don't allow calling GetRuntimeDelegate from InitializeForApp. + HostApiUnsupportedVersion == hr) // hdt_get_function_pointer was added in .NET 5. + { + hr = InitializeCoreClrPre5(pState, wzNativeHostPath); + } + else + { + ExitOnFailure(hr, "HostfxrGetRuntimeDelegate failed"); + } + +LExit: + return hr; +} + +static HRESULT InitializeCoreClrPre5( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ) +{ + HRESULT hr = S_OK; int32_t rc = 0; LPCWSTR* rgPropertyKeys = NULL; LPCWSTR* rgPropertyValues = NULL; diff --git a/src/dnchost/dncutil.h b/src/dnchost/dncutil.h index 1a7c16e3..85eda3b2 100644 --- a/src/dnchost/dncutil.h +++ b/src/dnchost/dncutil.h @@ -14,6 +14,8 @@ struct HOSTFXR_STATE hostfxr_get_runtime_properties_fn pfnHostfxrGetRuntimeProperties; hostfxr_set_error_writer_fn pfnHostfxrSetErrorWriter; hostfxr_close_fn pfnHostfxrClose; + hostfxr_get_runtime_delegate_fn pfnHostfxrGetRuntimeDelegate; + get_function_pointer_fn pfnGetFunctionPointer; coreclr_initialize_ptr pfnCoreclrInitialize; coreclr_create_delegate_ptr pfnCoreclrCreateDelegate; void* pClrHandle; diff --git a/src/dnchost/precomp.h b/src/dnchost/precomp.h index d19a0780..84ff6424 100644 --- a/src/dnchost/precomp.h +++ b/src/dnchost/precomp.h @@ -24,6 +24,7 @@ #define NETHOST_USE_AS_STATIC #include #include +#include #include "coreclrhost.h" #include "dncutil.h" -- cgit v1.2.3-55-g6feb From f407e08ed9695a59e5f41cfc7a41cd3c8138817a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 7 Aug 2020 19:02:26 -0600 Subject: WIXFEAT:4863 Update to latest thmutil. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 12 ++++++------ src/Samples/bafunctions/packages.config | 6 +++--- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 12 ++++++------ src/dnchost/packages.config | 6 +++--- src/mbahost/mbahost.vcxproj | 12 ++++++------ src/mbahost/packages.config | 6 +++--- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +- .../FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 12 ++++++------ src/test/examples/TestEngine/packages.config | 6 +++--- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/wixext/BalCompiler.cs | 10 +++++----- src/wixstdba/WixStandardBootstrapperApplication.cpp | 18 ++++++++++-------- src/wixstdba/packages.config | 6 +++--- src/wixstdba/wixstdba.vcxproj | 12 ++++++------ 20 files changed, 68 insertions(+), 66 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 41935656..4667cc29 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0149" + "WixToolset.Sdk": "4.0.0-build-0150" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index e1e83dbe..e4adf40f 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -57,9 +57,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 34e10a05..e4a6186d 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 42e07501..83007f13 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -48,7 +48,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.33\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.35\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 500dc72d..5f14527c 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index f9a2546f..f6f44598 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -78,8 +78,8 @@ - - - + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index dfeefbc4..6af3e475 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -5,7 +5,7 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 575187b4..6123d8f1 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -83,8 +83,8 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index f3c6255c..7d35694c 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index a7983a16..9e0d550c 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 5b7e2c0a..982c0b9e 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -15,6 +15,6 @@ - + \ 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 6ff0cfda..80b855a1 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index 8016ad15..eb0a59e8 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 4890f609..cc772e37 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/packages.config b/src/test/examples/TestEngine/packages.config index 34e10a05..e4a6186d 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 d99e1ba3..dc9402a6 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 294cf45c..c836adbe 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -491,7 +491,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) { Value = launchTarget, - Type = "string", + Type = WixBundleVariableType.Formatted, }); } @@ -500,7 +500,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId")) { Value = launchTargetElevatedId, - Type = "string", + Type = WixBundleVariableType.Formatted, }); } @@ -509,7 +509,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments")) { Value = launchArguments, - Type = "string", + Type = WixBundleVariableType.Formatted, }); } @@ -518,7 +518,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden")) { Value = "yes", - Type = "string", + Type = WixBundleVariableType.Formatted, }); } @@ -528,7 +528,7 @@ namespace WixToolset.Bal section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder")) { Value = launchWorkingDir, - Type = "string", + Type = WixBundleVariableType.Formatted, }); } diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 8d07c760..c5ef59ec 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -183,6 +183,7 @@ static HRESULT DAPI GetVariableStringCallback( static HRESULT DAPI SetVariableStringCallback( __in_z LPCWSTR wzVariable, __in_z_opt LPCWSTR wzValue, + __in BOOL fFormatted, __in_opt LPVOID pvContext ); static LPCSTR LoggingRequestStateToString( @@ -975,7 +976,7 @@ public: // IBootstrapperApplication // If a restart was encountered and we are not suppressing restarts, then restart is required. m_fRestartRequired = (BOOTSTRAPPER_APPLY_RESTART_NONE != restart && BOOTSTRAPPER_RESTART_NEVER < m_command.restart); - BalSetStringVariable(WIXSTDBA_VARIABLE_RESTART_REQUIRED, m_fRestartRequired ? L"1" : NULL); + BalSetStringVariable(WIXSTDBA_VARIABLE_RESTART_REQUIRED, m_fRestartRequired ? L"1" : NULL, FALSE); // If a restart is required and we're not displaying a UI or we are not supposed to prompt for restart then allow the restart. m_fAllowRestart = m_fRestartRequired && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_RESTART_PROMPT < m_command.restart); @@ -1905,7 +1906,7 @@ private: // privates hr = StrAllocString(&sczVariableValue, ++pwc, 0); BalExitOnFailure(hr, "Failed to copy variable value."); - hr = m_pEngine->SetVariableString(sczVariableName, sczVariableValue); + hr = m_pEngine->SetVariableString(sczVariableName, sczVariableValue, FALSE); BalExitOnFailure(hr, "Failed to set variable."); } else @@ -2891,7 +2892,7 @@ private: // privates } else if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON)) { - fLaunchTargetExists = BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); + fLaunchTargetExists = BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); } ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON, fLaunchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < m_plannedAction); @@ -3192,24 +3193,24 @@ private: // privates hr = BalFormatString(sczUnformattedLaunchTarget, &sczLaunchTarget); BalExitOnFailure(hr, "Failed to format launch target variable: %ls", sczUnformattedLaunchTarget); - if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID)) + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID)) { hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID, &sczLaunchTargetElevatedId); BalExitOnFailure(hr, "Failed to get launch target elevated id '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID); } - if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS)) + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS)) { hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS, &sczUnformattedArguments); BalExitOnFailure(hr, "Failed to get launch arguments '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS); } - if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_HIDDEN)) + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_HIDDEN)) { nCmdShow = SW_HIDE; } - if (BalStringVariableExists(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER)) + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER)) { hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER, &sczUnformattedLaunchFolder); BalExitOnFailure(hr, "Failed to get launch working directory variable '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER); @@ -3879,10 +3880,11 @@ static HRESULT DAPI GetVariableStringCallback( static HRESULT DAPI SetVariableStringCallback( __in_z LPCWSTR wzVariable, __in_z_opt LPCWSTR wzValue, + __in BOOL fFormatted, __in_opt LPVOID /*pvContext*/ ) { - return BalSetStringVariable(wzVariable, wzValue); + return BalSetStringVariable(wzVariable, wzValue, fFormatted); } static LPCSTR LoggingRequestStateToString( diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index f3c6255c..7d35694c 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index b3400e35..a4ce7453 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -78,8 +78,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 2df3f73a2cc98e5d96ad4b2f2bf53a3558cc44ee Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 7 Aug 2020 19:57:26 -0600 Subject: WIXBUG:5688 Installation Successful and Repair Successful headers not shown correctly. --- src/wixstdba/Resources/HyperlinkLargeTheme.xml | 8 ++++---- src/wixstdba/Resources/HyperlinkSidebarTheme.xml | 8 ++++---- src/wixstdba/Resources/HyperlinkTheme.xml | 8 ++++---- src/wixstdba/Resources/RtfLargeTheme.xml | 8 ++++---- src/wixstdba/Resources/RtfTheme.xml | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/wixstdba/Resources/HyperlinkLargeTheme.xml b/src/wixstdba/Resources/HyperlinkLargeTheme.xml index 9aff929f..39a38ee0 100644 --- a/src/wixstdba/Resources/HyperlinkLargeTheme.xml +++ b/src/wixstdba/Resources/HyperlinkLargeTheme.xml @@ -74,8 +74,8 @@ #(loc.SuccessHeader) #(loc.SuccessLayoutHeader) #(loc.SuccessUninstallHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) #(loc.FailureHyperlinkLogText) diff --git a/src/wixstdba/Resources/HyperlinkSidebarTheme.xml b/src/wixstdba/Resources/HyperlinkSidebarTheme.xml index 24a53583..1dff9d7e 100644 --- a/src/wixstdba/Resources/HyperlinkSidebarTheme.xml +++ b/src/wixstdba/Resources/HyperlinkSidebarTheme.xml @@ -83,8 +83,8 @@ #(loc.SuccessHeader) #(loc.SuccessLayoutHeader) #(loc.SuccessUninstallHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) #(loc.FailureHyperlinkLogText) diff --git a/src/wixstdba/Resources/HyperlinkTheme.xml b/src/wixstdba/Resources/HyperlinkTheme.xml index 51a5be5b..657db34b 100644 --- a/src/wixstdba/Resources/HyperlinkTheme.xml +++ b/src/wixstdba/Resources/HyperlinkTheme.xml @@ -71,8 +71,8 @@ #(loc.SuccessHeader) #(loc.SuccessLayoutHeader) #(loc.SuccessUninstallHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) #(loc.FailureHyperlinkLogText) diff --git a/src/wixstdba/Resources/RtfLargeTheme.xml b/src/wixstdba/Resources/RtfLargeTheme.xml index 2a87f912..3571e13a 100644 --- a/src/wixstdba/Resources/RtfLargeTheme.xml +++ b/src/wixstdba/Resources/RtfLargeTheme.xml @@ -73,8 +73,8 @@ #(loc.SuccessHeader) #(loc.SuccessLayoutHeader) #(loc.SuccessUninstallHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) #(loc.FailureHyperlinkLogText) diff --git a/src/wixstdba/Resources/RtfTheme.xml b/src/wixstdba/Resources/RtfTheme.xml index 6654c3f2..d6535bac 100644 --- a/src/wixstdba/Resources/RtfTheme.xml +++ b/src/wixstdba/Resources/RtfTheme.xml @@ -71,8 +71,8 @@ #(loc.SuccessHeader) #(loc.SuccessLayoutHeader) #(loc.SuccessUninstallHeader) - #(loc.SuccessInstallHeader) - #(loc.SuccessRepairHeader) + #(loc.SuccessInstallHeader) + #(loc.SuccessRepairHeader) #(loc.FailureHyperlinkLogText) -- cgit v1.2.3-55-g6feb From 8ff3569ddfb908107f9f1ef344fde0fdbbccb31d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 10 Aug 2020 12:44:45 -0500 Subject: Fix missing inner text conversion. --- src/wixlib/wixstdba.wxs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs index 1b5e1342..b2923eaa 100644 --- a/src/wixlib/wixstdba.wxs +++ b/src/wixlib/wixstdba.wxs @@ -15,7 +15,7 @@ - !(wix.WixStdbaLicenseRtfName=license.rtf) + @@ -32,7 +32,7 @@ - !(wix.WixStdbaLicenseRtfName=license.rtf) + @@ -47,7 +47,7 @@ - !(wix.WixStdbaLicenseUrl) + @@ -62,7 +62,7 @@ - !(wix.WixStdbaLicenseUrl) + @@ -78,7 +78,7 @@ - !(wix.WixStdbaLicenseUrl) + -- cgit v1.2.3-55-g6feb From 6241bbf88e61f07816ea8fd028d7aaeba6bc524e Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Sat, 26 Sep 2020 20:31:50 -0400 Subject: Last bit of inner text expunged. --- Bal.wixext.sln | 6 +++--- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 4 ++-- src/wixext/BalCompiler.cs | 5 ++++- src/wixlib/bal.wixproj | 11 +++-------- 4 files changed, 12 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/Bal.wixext.sln b/Bal.wixext.sln index 7fcfe556..eaf23ba0 100644 --- a/Bal.wixext.sln +++ b/Bal.wixext.sln @@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29503.13 MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}" +EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "src\mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}" @@ -17,9 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.Host", "src\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "src\test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}" EndProject diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index cc772e37..543668d2 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -27,9 +27,9 @@ Application Console Example.TestEngine - v141 + v142 Unicode - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + 10.0 diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index c836adbe..484dd9e4 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -280,7 +280,7 @@ namespace WixToolset.Bal private void ParseConditionElement(Intermediate intermediate, IntermediateSection section, XElement node) { var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - var condition = this.ParseHelper.GetConditionInnerText(node); // condition is the inner text of the element. + string condition = null; string message = null; foreach (var attrib in node.Attributes()) @@ -292,6 +292,9 @@ namespace WixToolset.Bal case "Message": message = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; default: this.ParseHelper.UnexpectedAttribute(node, attrib); break; diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 5c743cd9..5657ffbd 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -1,27 +1,22 @@ - - + Library true en-us - - + - - - - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 94cc82139b10aa098e0586fbad80b0412c788527 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 24 Oct 2020 20:18:26 -0500 Subject: Update dependencies. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 16 ++++++++-------- src/Samples/bafunctions/packages.config | 8 ++++---- src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 2 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 7 ++++--- src/WixToolset.Mba.Host/packages.config | 4 ++-- src/dnchost/dnchost.vcxproj | 16 ++++++++-------- src/dnchost/packages.config | 8 ++++---- src/mbahost/mbahost.vcxproj | 16 ++++++++-------- src/mbahost/packages.config | 8 ++++---- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 4 ++-- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +- .../FullFramework4MBA/Example.FullFramework4MBA.csproj | 4 ++-- .../examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 4 ++-- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 16 ++++++++-------- src/test/examples/TestEngine/packages.config | 8 ++++---- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 4 ++-- src/wixext/WixToolset.Bal.wixext.csproj | 2 +- src/wixlib/bal.wixproj | 2 +- src/wixstdba/WixStandardBootstrapperApplication.cpp | 11 ++++++++--- src/wixstdba/packages.config | 8 ++++---- src/wixstdba/precomp.h | 1 + src/wixstdba/wixstdba.vcxproj | 16 ++++++++-------- 23 files changed, 88 insertions(+), 81 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 4667cc29..33154a9e 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0150" + "WixToolset.Sdk": "4.0.0-build-0162" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index e4adf40f..f347f2d3 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -52,14 +52,14 @@ - + 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}. - - - - + + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index e4a6186d..5c253606 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - - + + + + \ No newline at end of file diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index 707edd1b..a79b3f96 100644 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -38,6 +38,6 @@ - + diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 83007f13..9b21446b 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -15,6 +15,7 @@ v2.0 Managed Bootstrapper Application entry point embedded + false true @@ -48,7 +49,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.35\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.40\lib\net20\WixToolset.Mba.Core.dll @@ -82,7 +83,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}. @@ -93,7 +94,7 @@ - + diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 5f14527c..f4675f10 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -3,6 +3,6 @@ - - + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index f6f44598..99c545df 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -66,7 +66,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}. @@ -77,9 +77,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 6af3e475..d5f7cc2d 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -3,9 +3,9 @@ - + - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 6123d8f1..9aa7dbbd 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -71,7 +71,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}. @@ -82,9 +82,9 @@ - - - - + + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 7d35694c..40cb1671 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -3,8 +3,8 @@ - - - - + + + + \ No newline at end of file diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 9e0d550c..9b206803 100644 --- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -12,7 +12,7 @@ - - + + \ 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 982c0b9e..10e2be8a 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -15,6 +15,6 @@ - + \ 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 80b855a1..a8654874 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index eb0a59e8..f2ee19a4 100644 --- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj @@ -17,7 +17,7 @@ - - + + \ 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 543668d2..d0a7ac59 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -36,7 +36,7 @@ - + @@ -67,9 +67,9 @@ 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/packages.config b/src/test/examples/TestEngine/packages.config index e4a6186d..5c253606 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 dc9402a6..32305ef9 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -10,7 +10,7 @@ - - + + \ No newline at end of file diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index 4cc790c8..6bfadd1b 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -28,7 +28,7 @@ - + diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 5657ffbd..38cdf242 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -17,6 +17,6 @@ - + \ No newline at end of file diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index c5ef59ec..44c77057 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -264,7 +264,7 @@ public: // IBootstrapperApplication __in BOOTSTRAPPER_RELATION_TYPE relationType, __in LPCWSTR wzBundleTag, __in BOOL fPerMachine, - __in DWORD64 dw64Version, + __in LPCWSTR wzVersion, __in BOOTSTRAPPER_RELATED_OPERATION operation, __inout BOOL* pfCancel ) @@ -281,7 +281,7 @@ public: // IBootstrapperApplication m_fDowngrading = TRUE; } - return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, dw64Version, operation, pfCancel); + return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, operation, pfCancel); } @@ -2272,6 +2272,7 @@ private: // privates HRESULT hr = S_OK; ULARGE_INTEGER uliVersion = { }; LPWSTR sczCurrentPath = NULL; + VERUTIL_VERSION* pVersion = NULL; hr = PathForCurrentProcess(&sczCurrentPath, NULL); BalExitOnFailure(hr, "Failed to get bundle path."); @@ -2279,10 +2280,14 @@ private: // privates hr = FileVersion(sczCurrentPath, &uliVersion.HighPart, &uliVersion.LowPart); BalExitOnFailure(hr, "Failed to get bundle file version."); - hr = m_pEngine->SetVariableVersion(WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION, uliVersion.QuadPart); + hr = VerVersionFromQword(uliVersion.QuadPart, &pVersion); + BalExitOnFailure(hr, "Failed to create bundle file version."); + + hr = m_pEngine->SetVariableVersion(WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION, pVersion->sczVersion); BalExitOnFailure(hr, "Failed to set WixBundleFileVersion variable."); LExit: + ReleaseVerutilVersion(pVersion); ReleaseStr(sczCurrentPath); return hr; diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 7d35694c..40cb1671 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -3,8 +3,8 @@ - - - - + + + + \ No newline at end of file diff --git a/src/wixstdba/precomp.h b/src/wixstdba/precomp.h index 9c2b9f6a..547183bd 100644 --- a/src/wixstdba/precomp.h +++ b/src/wixstdba/precomp.h @@ -30,6 +30,7 @@ #include "shelutil.h" #include "strutil.h" #include "thmutil.h" +#include "verutil.h" #include "uriutil.h" #include "xmlutil.h" diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index a4ce7453..220be9e6 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -66,7 +66,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - + 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}. @@ -77,9 +77,9 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - - + + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From fefb8f0571400937ca8bd9c7e5984bbb24a94181 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 31 Oct 2020 19:32:56 -0500 Subject: Strong-name sign WiX assemblies. --- global.json | 2 +- src/CSharp.Build.props | 11 +++++++++++ src/Directory.Build.props | 1 + src/Samples/bafunctions/bafunctions.vcxproj | 4 ++-- src/Samples/bafunctions/packages.config | 2 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 4 ++-- src/dnchost/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 4 ++-- src/mbahost/packages.config | 2 +- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 2 +- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +- .../FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- .../examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 4 ++-- src/test/examples/TestEngine/packages.config | 2 +- src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 2 +- src/wix.snk | Bin 0 -> 596 bytes src/wixstdba/packages.config | 2 +- src/wixstdba/wixstdba.vcxproj | 4 ++-- 21 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 src/CSharp.Build.props create mode 100644 src/wix.snk (limited to 'src') diff --git a/global.json b/global.json index 33154a9e..64522575 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0162" + "WixToolset.Sdk": "4.0.0-build-0163" }, "sdk": { "allowPrerelease": false diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props new file mode 100644 index 00000000..b12f4c6e --- /dev/null +++ b/src/CSharp.Build.props @@ -0,0 +1,11 @@ + + + + + true + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index a22f4470..f83cc154 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -22,6 +22,7 @@ WiX Toolset + diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index f347f2d3..b618b07e 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,7 +2,7 @@ - + @@ -57,7 +57,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}. - + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 5c253606..c70db24e 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 9b21446b..ef4dfe34 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -49,7 +49,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.40\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.41\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index f4675f10..a6513da6 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 99c545df..c6c2360c 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,7 +4,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index d5f7cc2d..d40327be 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -5,7 +5,7 @@ - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 9aa7dbbd..54d0cf27 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,7 +5,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 40cb1671..5b220331 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 9b206803..19fbd249 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 10e2be8a..20c5c65c 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -15,6 +15,6 @@ - + \ 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 a8654874..fff76795 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index f2ee19a4..ccc642f0 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 d0a7ac59..90a8a139 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,7 +1,7 @@ - + @@ -68,7 +68,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}. - + diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index 5c253606..c70db24e 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -2,6 +2,6 @@ - + \ 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 32305ef9..b488159d 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -11,6 +11,6 @@ - + \ No newline at end of file diff --git a/src/wix.snk b/src/wix.snk new file mode 100644 index 00000000..3908a66a Binary files /dev/null and b/src/wix.snk differ diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 40cb1671..5b220331 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 220be9e6..cb321289 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,7 +5,7 @@ - + @@ -78,7 +78,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - + -- cgit v1.2.3-55-g6feb From 0031d5e8f859b342ac9860b7055bb738b6303ec0 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 31 Oct 2020 19:54:44 -0500 Subject: Add test for Overridable. Also, reenable MBA test. --- src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 36 ++++++++++++++++++++-- .../WixToolsetTest.Bal/TestData/MBA/Bundle.wxs | 2 +- .../TestData/Overridable/Bundle.wxs | 13 ++++++++ .../WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 2 +- 4 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs (limited to 'src') diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index a19013f5..277a941a 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -45,6 +45,39 @@ namespace WixToolsetTest.Bal } } + [Fact] + public void CanBuildUsingOverridable() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\Overridable"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balOverridableVariables = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixStdbaOverridableVariable"); + var balOverridableVariable = (XmlNode)Assert.Single(balOverridableVariables); + Assert.Equal("", balOverridableVariable.GetTestXml()); + } + } + [Fact] public void CanBuildUsingWixStdBa() { @@ -69,7 +102,7 @@ namespace WixToolsetTest.Bal } } - [Fact(Skip = "Skip test until cycle with Netfx.wixext and this repo is resolved")] + [Fact] public void CantBuildUsingMBAWithNoPrereqs() { using (var fs = new DisposableFileSystem()) @@ -84,7 +117,6 @@ namespace WixToolsetTest.Bal "build", Path.Combine(bundleSourceFolder, "Bundle.wxs"), "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-ext", TestData.Get(@"WixToolset.NetFx.wixext.dll"), "-intermediateFolder", intermediateFolder, "-o", bundleFile, }); diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs index b3538c68..e6f1d566 100644 --- a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs @@ -4,7 +4,7 @@ - + diff --git a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs new file mode 100644 index 00000000..3ac3df60 --- /dev/null +++ b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 3c742604..199b82e2 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -13,6 +13,7 @@ + @@ -32,7 +33,6 @@ - -- cgit v1.2.3-55-g6feb 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). --- appveyor.yml | 2 +- global.json | 4 ++-- src/dnchost/dnchost.vcxproj | 2 +- src/dnchost/dncutil.cpp | 9 ++++++++- src/dnchost/packages.config | 2 +- .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 4 ++-- .../FullFramework2MBA/Example.FullFramework2MBA.csproj | 2 +- .../FullFramework4MBA/Example.FullFramework4MBA.csproj | 2 +- .../examples/LatestCoreMBA/Example.LatestCoreMBA.csproj | 12 +++++------- src/test/examples/TestEngine/TestEngine.cpp | 14 +++++++++++--- src/test/examples/TestEngine/TestEngine.h | 1 + src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 6 +++--- 12 files changed, 37 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/appveyor.yml b/appveyor.yml index 7c686b04..147bd6aa 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ branches: - master - develop -image: Visual Studio 2019 +image: Visual Studio 2019 Preview version: 0.0.0.{build} configuration: Release diff --git a/global.json b/global.json index 64522575..00cdfa49 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0163" + "WixToolset.Sdk": "4.0.0-build-0164" }, "sdk": { - "allowPrerelease": false + "allowPrerelease": true } } diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index c6c2360c..d46c3a59 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -28,7 +28,7 @@ - ..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0-preview.7.20364.11\runtimes\win-x86\native\ + ..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0-rc.2.20475.5\runtimes\win-x86\native\ shlwapi.lib;$(NetHostPath)libnethost.lib diff --git a/src/dnchost/dncutil.cpp b/src/dnchost/dncutil.cpp index 4a82d961..89fe707f 100644 --- a/src/dnchost/dncutil.cpp +++ b/src/dnchost/dncutil.cpp @@ -182,7 +182,14 @@ static void HOSTFXR_CALLTYPE DnchostErrorWriter( __in LPCWSTR wzMessage ) { - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "error from hostfxr: %ls", wzMessage); + BOOTSTRAPPER_LOG_LEVEL level = BOOTSTRAPPER_LOG_LEVEL_ERROR; + + if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, 0, wzMessage, -1, L"The requested delegate type is not available in the target framework.", -1)) + { + level = BOOTSTRAPPER_LOG_LEVEL_DEBUG; + } + + BalLog(level, "error from hostfxr: %ls", wzMessage); } static HRESULT InitializeHostfxr( diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index d40327be..113d005c 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj index 19fbd249..cb66c138 100644 --- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 win-x86;win-x64 true Earliest .NET Core MBA @@ -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 20c5c65c..21079ed1 100644 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -15,6 +15,6 @@ - + \ 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 fff76795..a05e7888 100644 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj index ccc642f0..9f3f02d9 100644 --- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj @@ -1,23 +1,21 @@ - netcoreapp3.1 + net5.0 win-x86;win-x64 true Latest .NET Core MBA - - false - true - - + + + - + \ No newline at end of file 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 ); diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj index b488159d..296e5be9 100644 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -1,7 +1,7 @@ - + - netcoreapp3.1 + net5.0-windows win-x86;win-x64 true WPF .NET Core MBA @@ -11,6 +11,6 @@ - + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 225dbc5549bbb1b74d7e234ed90a5dbb11f15ccf Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 2 Dec 2020 23:08:43 -0600 Subject: Update dependencies and add fallbacks for new BA messages. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 12 +-- src/Samples/bafunctions/packages.config | 6 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 14 +-- src/dnchost/packages.config | 8 +- src/mbahost/mbahost.vcxproj | 12 +-- src/mbahost/packages.config | 6 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 12 +-- src/test/examples/TestEngine/packages.config | 6 +- .../WixStandardBootstrapperApplication.cpp | 110 +++++++++++++++++++++ src/wixstdba/packages.config | 6 +- src/wixstdba/wixstdba.vcxproj | 12 +-- 14 files changed, 160 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 00cdfa49..a8e56217 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0164" + "WixToolset.Sdk": "4.0.0-build-0170" }, "sdk": { "allowPrerelease": true diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index b618b07e..9e0aa581 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -57,9 +57,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index c70db24e..b078faf8 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index ef4dfe34..7bda988c 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -49,7 +49,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.41\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.44\lib\net20\WixToolset.Mba.Core.dll diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index a6513da6..6192f1b7 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index d46c3a59..419077ac 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -28,7 +28,7 @@ - ..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0-rc.2.20475.5\runtimes\win-x86\native\ + ..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-x86\native\ shlwapi.lib;$(NetHostPath)libnethost.lib @@ -78,8 +78,8 @@ - - - + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 113d005c..af177833 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -4,8 +4,8 @@ - - - - + + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 54d0cf27..e2cc562e 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -83,8 +83,8 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 5b220331..4b6974b3 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - - + + + \ 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 90a8a139..50fd7559 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/packages.config b/src/test/examples/TestEngine/packages.config index c70db24e..b078faf8 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/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 44c77057..c74f3087 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -1224,6 +1224,36 @@ public: // IBootstrapperApplication case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIPACKAGE: OnPlanMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONBEGINMSITRANSACTIONBEGIN: + OnBeginMsiTransactionBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONBEGINMSITRANSACTIONCOMPLETE: + OnBeginMsiTransactionCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCOMMITMSITRANSACTIONBEGIN: + OnCommitMsiTransactionBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCOMMITMSITRANSACTIONCOMPLETE: + OnCommitMsiTransactionCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONROLLBACKMSITRANSACTIONBEGIN: + OnRollbackMsiTransactionBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONROLLBACKMSITRANSACTIONCOMPLETE: + OnRollbackMsiTransactionCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPAUSEAUTOMATICUPDATESBEGIN: + OnPauseAutomaticUpdatesBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPAUSEAUTOMATICUPDATESCOMPLETE: + OnPauseAutomaticUpdatesCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN: + OnSystemRestorePointBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE: + OnSystemRestorePointCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; default: BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message); m_pfnBAFunctionsProc((BA_FUNCTIONS_MESSAGE)message, pvArgs, pvResults, m_pvBAFunctionsProcContext); @@ -1689,6 +1719,86 @@ private: // privates BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, actionMsiProperty, uiLevel, fDisableExternalUiHandler ? "yes" : "no", pResults->actionMsiProperty, pResults->uiLevel, pResults->fDisableExternalUiHandler ? "yes" : "no"); } + void OnBeginMsiTransactionBeginFallback( + __in BA_ONBEGINMSITRANSACTIONBEGIN_ARGS* pArgs, + __inout BA_ONBEGINMSITRANSACTIONBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONBEGINMSITRANSACTIONBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnBeginMsiTransactionCompleteFallback( + __in BA_ONBEGINMSITRANSACTIONCOMPLETE_ARGS* pArgs, + __inout BA_ONBEGINMSITRANSACTIONCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONBEGINMSITRANSACTIONCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCommitMsiTransactionBeginFallback( + __in BA_ONCOMMITMSITRANSACTIONBEGIN_ARGS* pArgs, + __inout BA_ONCOMMITMSITRANSACTIONBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCOMMITMSITRANSACTIONBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCommitMsiTransactionCompleteFallback( + __in BA_ONCOMMITMSITRANSACTIONCOMPLETE_ARGS* pArgs, + __inout BA_ONCOMMITMSITRANSACTIONCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCOMMITMSITRANSACTIONCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnRollbackMsiTransactionBeginFallback( + __in BA_ONROLLBACKMSITRANSACTIONBEGIN_ARGS* pArgs, + __inout BA_ONROLLBACKMSITRANSACTIONBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONROLLBACKMSITRANSACTIONBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnRollbackMsiTransactionCompleteFallback( + __in BA_ONROLLBACKMSITRANSACTIONCOMPLETE_ARGS* pArgs, + __inout BA_ONROLLBACKMSITRANSACTIONCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONROLLBACKMSITRANSACTIONCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPauseAutomaticUpdatesBeginFallback( + __in BA_ONPAUSEAUTOMATICUPDATESBEGIN_ARGS* pArgs, + __inout BA_ONPAUSEAUTOMATICUPDATESBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPAUSEAUTOMATICUPDATESBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPauseAutomaticUpdatesCompleteFallback( + __in BA_ONPAUSEAUTOMATICUPDATESCOMPLETE_ARGS* pArgs, + __inout BA_ONPAUSEAUTOMATICUPDATESCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPAUSEAUTOMATICUPDATESCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnSystemRestorePointBeginFallback( + __in BA_ONSYSTEMRESTOREPOINTBEGIN_ARGS* pArgs, + __inout BA_ONSYSTEMRESTOREPOINTBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnSystemRestorePointCompleteFallback( + __in BA_ONSYSTEMRESTOREPOINTCOMPLETE_ARGS* pArgs, + __inout BA_ONSYSTEMRESTOREPOINTCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + // // UiThreadProc - entrypoint for UI thread. // diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 5b220331..4b6974b3 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index cb321289..48d013a2 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -78,8 +78,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 00a9ec2a445e482deaeea7d85dcb2b9f7d93e55d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 3 Dec 2020 10:45:24 -0600 Subject: WIXFEAT:4626 - Display progress for pausing updates and creating SRP --- .../WixStandardBootstrapperApplication.cpp | 52 ++++++++++++++++++++++ 1 file changed, 52 insertions(+) (limited to 'src') diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index c74f3087..3fa7d8a6 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -542,6 +542,58 @@ public: // IBootstrapperApplication } + virtual STDMETHODIMP OnPauseAutomaticUpdatesBegin( + ) + { + HRESULT hr = S_OK; + LOC_STRING* pLocString = NULL; + LPWSTR sczFormattedString = NULL; + LPCWSTR wz = NULL; + + hr = __super::OnPauseAutomaticUpdatesBegin(); + + LocGetString(m_pWixLoc, L"#(loc.PauseAutomaticUpdatesMessage)", &pLocString); + + if (pLocString) + { + BalFormatString(pLocString->wzText, &sczFormattedString); + } + + wz = sczFormattedString ? sczFormattedString : L"Pausing Windows automatic updates"; + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); + + ReleaseStr(sczFormattedString); + return hr; + } + + + virtual STDMETHODIMP OnSystemRestorePointBegin( + ) + { + HRESULT hr = S_OK; + LOC_STRING* pLocString = NULL; + LPWSTR sczFormattedString = NULL; + LPCWSTR wz = NULL; + + hr = __super::OnSystemRestorePointBegin(); + + LocGetString(m_pWixLoc, L"#(loc.SystemRestorePointMessage)", &pLocString); + + if (pLocString) + { + BalFormatString(pLocString->wzText, &sczFormattedString); + } + + wz = sczFormattedString ? sczFormattedString : L"Creating system restore point"; + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); + + ReleaseStr(sczFormattedString); + return hr; + } + + virtual STDMETHODIMP OnCachePackageBegin( __in_z LPCWSTR wzPackageId, __in DWORD cCachePayloads, -- cgit v1.2.3-55-g6feb From 7c8acb14937d25177dcb0d5e784e46e71bad8b57 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 3 Dec 2020 10:53:28 -0600 Subject: Ignore C26812 warning for C style enums. --- src/Cpp.Build.props | 8 ++++++++ src/CustomizedNativeRecommendedRules.ruleset | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 src/CustomizedNativeRecommendedRules.ruleset (limited to 'src') diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props index 9b7a1bb5..e7bba117 100644 --- a/src/Cpp.Build.props +++ b/src/Cpp.Build.props @@ -6,12 +6,20 @@ Win32 $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ $(OutputPath)$(Platform)\ + + + $(Company) + $(Copyright) $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset + + $(DisableSpecificCompilerWarnings) diff --git a/src/CustomizedNativeRecommendedRules.ruleset b/src/CustomizedNativeRecommendedRules.ruleset new file mode 100644 index 00000000..142b141c --- /dev/null +++ b/src/CustomizedNativeRecommendedRules.ruleset @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 298244c7fdf36b577698e2855b7fa48a11f138db Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 4 Dec 2020 17:09:57 -0600 Subject: xsd got moved to doc repo. --- src/wixext/WixToolset.Bal.wixext.csproj | 1 - src/wixext/bal.xsd | 361 -------------------------------- 2 files changed, 362 deletions(-) delete mode 100644 src/wixext/bal.xsd (limited to 'src') diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index 6bfadd1b..c0a674da 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -14,7 +14,6 @@ - diff --git a/src/wixext/bal.xsd b/src/wixext/bal.xsd deleted file mode 100644 index 1bec2873..00000000 --- a/src/wixext/bal.xsd +++ /dev/null @@ -1,361 +0,0 @@ - - - - - - - - The source code schema for the WiX Toolset Bootstrapper Application Layer Extension. - - - - - - - - - Conditions for a bundle. The condition is specified in the inner text of the element. - - - - - - - - - - - - The condition that must evaluate to true for the installation to continue. - - - - - - Set the value to the text to display when the condition fails and the installation must be terminated. - - - - - - - - - - - - Configures WixStandardBootstrapperApplication for a Bundle. - - - - - - - - - - If set, the success page will show a Launch button the user can use to launch the application being installed. - The string value can be formatted using Burn variables enclosed in brackets, - to refer to installation directories and so forth. - - - - - - - Id of the target ApprovedExeForElevation element. - If set with LaunchTarget, WixStdBA will launch the application through the Engine's LaunchApprovedExe method instead of through ShellExecute. - - - - - - - If set, WixStdBA will supply these arguments when launching the application specified by the LaunchTarget attribute. - The string value can be formatted using Burn variables enclosed in brackets, - to refer to installation directories and so forth. - - - - - - - If set to "yes", WixStdBA will launch the application specified by the LaunchTarget attribute with the SW_HIDE flag. - This attribute is ignored when the LaunchTargetElevatedId attribute is specified. - - - - - - - WixStdBA will use this working folder when launching the specified application. - The string value can be formatted using Burn variables enclosed in brackets, - to refer to installation directories and so forth. - This attribute is ignored when the LaunchTargetElevatedId attribute is specified. - - - - - - Source file of the RTF license file. Cannot be used simultaneously with LicenseUrl. - - - - - URL target of the license link. Cannot be used simultaneously with LicenseFile. This attribute can be empty to hide the license link completely. - - - - - Source file of the logo graphic. - - - - - Source file of the side logo graphic. - - - - - Source file of the theme XML. - - - - - Source file of the theme localization .wxl file. - - - - - If set to "yes", the Options button will not be shown and the user will not be able to choose an installation directory. - - - - - If set to "yes", attempting to installer a downgraded version of a bundle will be treated as a successful do-nothing operation. - The default behavior (or when explicitly set to "no") is to treat downgrade attempts as failures. - - - - - If set to "yes", the Repair button will not be shown in the maintenance-mode UI. - - - - - If set to "yes", the application version will be displayed on the UI. - - - - - If set to "yes", the bundle can be pre-cached using the /cache command line argument. - - - - - - - - - Configures the ManagedBootstrapperApplicationHost for a Bundle. - - - - - - - - - Source file of the logo graphic. - - - - - Source file of the theme XML. - - - - - Source file of the theme localization .wxl file. - - - - - - - - - Adds license information for a prereq package, should only be used when unable to add the license attributes to the package directly. - - - - - - - - - - Id of the target package. - - - - - Source file of the license. May not be used with LicenseUrl. - - - - - Source url of the license. May not be used with LicenseFile. - - - - - - - - - Configures the DotNetCoreBootstrapperApplicationHost for a Bundle. - - - - - - - - - Source file of the logo graphic. - - - - - Source file of the theme XML. - - - - - Source file of the theme localization .wxl file. - - - - - - Whether the .NET Core BA was published as self-contained (SCD). - If using PublishTrimmed in the .NET Core project, there must be an item group with <TrimmerRootAssembly Include="System.Runtime.Loader" /> - - - - - - - - - - When set to "yes", DotNetCoreBootstrapperApplicationHost will load the DLL and instantiate the type with the BootstrapperApplicationFactoryAttribute. - There must be corresponding deps.json and runtimeconfig.json files (set EnableDynamicLoading to True in the .NET Core project). - The .NET Core project must have been published, not just built. - Only one payload may be marked with this attribute set to "yes". - - - - - - - - - - - When set to "yes", WixStdBA will load the DLL and work with it to handle BA messages. - Only one payload may be marked with this attribute set to "yes". - - - - - - - - - - - Specifies whether the bundle will show the UI authored into the msi package. If not specified or the condition evaluates - to false, all information is routed to the bootstrapper application to provide a unified installation experience. - Otherwise, the UI authored into the msi package will be displayed on top of any bootstrapper application UI. - WixStdBA doesn't support EmbeddedUI. - - - - - - - - - - - - When set to "yes", lets the user override the variable's default value by specifying another value on the command line, - in the form Variable=Value. Otherwise, WixStdBA won't overwrite the default value and will log - "Ignoring attempt to set non-overridable variable: 'BAR'." - - - - - - - - - - - Source file of the RTF license file. - There may only be one package in the bundle that has either the PrereqLicenseFile attribute or the PrereqLicenseUrl attribute. - - - - - - - - - - - - - - URL target of the license link. - There may only be one package in the bundle that has either the PrereqLicenseFile attribute or the PrereqLicenseUrl attribute. - - - - - - - - - - - - - - When set to "yes", the Prereq BA will plan the package to be installed if its InstallCondition is "true" or empty. - - - - - - - - - - - - - Values of this type will either be "yes" or "no". - - - - - - - -- cgit v1.2.3-55-g6feb From c1c402ea51354813e7ff9ce313b95128cd60d373 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Fri, 4 Dec 2020 18:21:08 -0600 Subject: Remove xsd from nuspec. --- src/wixext/WixToolset.Bal.wixext.nuspec | 1 - 1 file changed, 1 deletion(-) (limited to 'src') diff --git a/src/wixext/WixToolset.Bal.wixext.nuspec b/src/wixext/WixToolset.Bal.wixext.nuspec index 38606a5a..011ba138 100644 --- a/src/wixext/WixToolset.Bal.wixext.nuspec +++ b/src/wixext/WixToolset.Bal.wixext.nuspec @@ -18,7 +18,6 @@ - -- cgit v1.2.3-55-g6feb From 1362692be423f821e98f2f5693849206f5ce8620 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 8 Dec 2020 11:35:47 -0600 Subject: Format wixlib files using 'wix format'. --- src/wixlib/BalExtension.wxs | 8 ---- src/wixlib/Dnc.wxs | 43 ++++++++++--------- src/wixlib/Mba.wxs | 90 ++++++++++++++++++++-------------------- src/wixlib/caSuffix.wxi | 13 +++--- src/wixlib/wixstdba.wxs | 77 +++++++++++++++++----------------- src/wixlib/wixstdba_platform.wxi | 27 ++++++------ src/wixlib/wixstdba_x86.wxs | 5 +-- 7 files changed, 124 insertions(+), 139 deletions(-) delete mode 100644 src/wixlib/BalExtension.wxs (limited to 'src') diff --git a/src/wixlib/BalExtension.wxs b/src/wixlib/BalExtension.wxs deleted file mode 100644 index 2da3d5b2..00000000 --- a/src/wixlib/BalExtension.wxs +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs index 2663360f..bb70583a 100644 --- a/src/wixlib/Dnc.wxs +++ b/src/wixlib/Dnc.wxs @@ -1,55 +1,54 @@ - - + - + - - - + + + - - - + + + - - + + - - + + - - + + - - - + + + - - - - + + + + diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs index a99b41d8..ae3084ca 100644 --- a/src/wixlib/Mba.wxs +++ b/src/wixlib/Mba.wxs @@ -1,78 +1,76 @@ - - + - + - - - + + + - - - - + + + - - + + - - + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi index a56a2393..18436269 100644 --- a/src/wixlib/caSuffix.wxi +++ b/src/wixlib/caSuffix.wxi @@ -1,28 +1,27 @@ - - + - + - + - + - + - + diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs index b2923eaa..8181b9b4 100644 --- a/src/wixlib/wixstdba.wxs +++ b/src/wixlib/wixstdba.wxs @@ -1,93 +1,92 @@ - - + - + - - - - + + + + - + - + - + - - - - + + + + - + - + - + - - - - + + + + - + - + - - - - + + + + - + - + - - - - - + + + + + - + - + - - - + + + diff --git a/src/wixlib/wixstdba_platform.wxi b/src/wixlib/wixstdba_platform.wxi index 4076e30c..a4dc917d 100644 --- a/src/wixlib/wixstdba_platform.wxi +++ b/src/wixlib/wixstdba_platform.wxi @@ -1,41 +1,40 @@ - - + - + - - + + - - + + - - + + - - + + - - + + - + diff --git a/src/wixlib/wixstdba_x86.wxs b/src/wixlib/wixstdba_x86.wxs index 09a5080c..e3ad07e8 100644 --- a/src/wixlib/wixstdba_x86.wxs +++ b/src/wixlib/wixstdba_x86.wxs @@ -1,8 +1,7 @@ - - + - + -- cgit v1.2.3-55-g6feb From c52a40fc649b0aebb673cced64a2773aa2425e2d Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 8 Dec 2020 11:36:06 -0600 Subject: Use new BootstrapperApplicationDll element. --- global.json | 2 +- src/wixlib/Dnc.wxs | 15 ++++++++++----- src/wixlib/Mba.wxs | 15 ++++++++++----- src/wixlib/wixstdba_platform.wxi | 19 +++++++++++++------ 4 files changed, 34 insertions(+), 17 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index a8e56217..4e99abc0 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0170" + "WixToolset.Sdk": "4.0.0-build-0171" }, "sdk": { "allowPrerelease": true diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs index bb70583a..9b5dc0ee 100644 --- a/src/wixlib/Dnc.wxs +++ b/src/wixlib/Dnc.wxs @@ -6,34 +6,39 @@ Dnc.wxs - .NET Core BA resources. --> - + + - + + - + + - + + - + + diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs index ae3084ca..4667904a 100644 --- a/src/wixlib/Mba.wxs +++ b/src/wixlib/Mba.wxs @@ -6,33 +6,38 @@ Mba.wxs - Managed UX resources. --> - + + - + + - + + - + + - + + diff --git a/src/wixlib/wixstdba_platform.wxi b/src/wixlib/wixstdba_platform.wxi index a4dc917d..fae52b80 100644 --- a/src/wixlib/wixstdba_platform.wxi +++ b/src/wixlib/wixstdba_platform.wxi @@ -4,37 +4,44 @@ - + + - + + - + + - + + - + + - + + + -- cgit v1.2.3-55-g6feb From 70e370b4494a87cbbe234130882cad4a1021f82a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 8 Dec 2020 23:03:30 -0600 Subject: Require the custom BA elements to reference built-in BAs. --- global.json | 4 +- .../WixToolsetTest.Bal/TestData/MBA/Bundle.wxs | 6 +- .../TestData/Overridable/Bundle.wxs | 8 +- .../TestData/WixStdBa/Bundle.wxs | 8 +- .../WixStdBa/DisplayInternalUIConditionBundle.wxs | 8 +- .../FrameworkDependentBundle.wxs | 21 ++- .../EarliestCoreBundleSCD/SelfContainedBundle.wxs | 10 +- .../TrimmedSelfContainedBundle.wxs | 10 +- src/test/examples/FullFramework2Bundle/Bundle.wxs | 9 +- src/test/examples/FullFramework4Bundle/Bundle.wxs | 9 +- .../FrameworkDependentBundle.wxs | 21 ++- .../LatestCoreBundleSCD/SelfContainedBundle.wxs | 10 +- .../TrimmedSelfContainedBundle.wxs | 10 +- .../WPFCoreBundleFDD/FrameworkDependentBundle.wxs | 21 ++- src/wixext/BalBurnBackendExtension.cs | 4 +- src/wixext/BalCompiler.cs | 180 ++++++++++++++++++++- src/wixlib/BalExtension_platform.wxi | 25 +++ src/wixlib/BalExtension_x86.wxs | 7 + src/wixlib/Dnc.wxs | 51 +----- src/wixlib/Mba.wxs | 98 ++++------- src/wixlib/caDecor.wxi | 39 +++++ src/wixlib/caSuffix.wxi | 27 ---- src/wixlib/wixstdba_platform.wxi | 47 ------ src/wixlib/wixstdba_x86.wxs | 7 - 24 files changed, 356 insertions(+), 284 deletions(-) create mode 100644 src/wixlib/BalExtension_platform.wxi create mode 100644 src/wixlib/BalExtension_x86.wxs create mode 100644 src/wixlib/caDecor.wxi delete mode 100644 src/wixlib/caSuffix.wxi delete mode 100644 src/wixlib/wixstdba_platform.wxi delete mode 100644 src/wixlib/wixstdba_x86.wxs (limited to 'src') diff --git a/global.json b/global.json index 4e99abc0..d614f6f5 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0171" + "WixToolset.Sdk": "4.0.0-build-0172" }, "sdk": { - "allowPrerelease": true + "allowPrerelease": false } } diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs index e6f1d566..1b72c725 100644 --- a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs @@ -1,8 +1,10 @@ - + - + + + diff --git a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs index 3ac3df60..5072b813 100644 --- a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs @@ -1,10 +1,10 @@ - + - - - + + + diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs index 82b0434d..3ba305b5 100644 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs @@ -1,10 +1,10 @@ - + - - - + + + diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs index 438fc23e..f08cfe6a 100644 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs @@ -1,10 +1,10 @@ - + - - - + + + diff --git a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs index 5cec494d..2bea6d38 100644 --- a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -1,15 +1,14 @@ - - + - - - - - - - - + + + + + + + + + diff --git a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs index d951ffc6..4e4eb105 100644 --- a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs @@ -1,11 +1,9 @@ - - + - - + + - + diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index 816524ed..0bcd7755 100644 --- a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -1,11 +1,9 @@ - - + - - + + - + diff --git a/src/test/examples/FullFramework2Bundle/Bundle.wxs b/src/test/examples/FullFramework2Bundle/Bundle.wxs index c95631db..d0acd0e4 100644 --- a/src/test/examples/FullFramework2Bundle/Bundle.wxs +++ b/src/test/examples/FullFramework2Bundle/Bundle.wxs @@ -1,13 +1,12 @@ - - + - + - + + diff --git a/src/test/examples/FullFramework4Bundle/Bundle.wxs b/src/test/examples/FullFramework4Bundle/Bundle.wxs index be0be131..8cb5b431 100644 --- a/src/test/examples/FullFramework4Bundle/Bundle.wxs +++ b/src/test/examples/FullFramework4Bundle/Bundle.wxs @@ -1,13 +1,12 @@ - - + - + - + + diff --git a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs index 22fb3d8b..72c576b4 100644 --- a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -1,15 +1,14 @@ - - + - - - - - - - - + + + + + + + + + diff --git a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs index 4b0fe38a..5aa10f01 100644 --- a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs @@ -1,11 +1,9 @@ - - + - - + + - + diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index eee87933..a9cf1ac7 100644 --- a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -1,11 +1,9 @@ - - + - - + + - + diff --git a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs index ecc5e8c1..266a8ecc 100644 --- a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs @@ -1,15 +1,14 @@ - - + - - - - - - - - + + + + + + + + + diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index 3f2cda05..7e481ee9 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -42,8 +42,8 @@ namespace WixToolset.Bal } var isStdBA = baId.StartsWith("WixStandardBootstrapperApplication"); - var isMBA = baId.StartsWith("ManagedBootstrapperApplicationHost"); - var isDNC = baId.StartsWith("DotNetCoreBootstrapperApplicationHost"); + var isMBA = baId.StartsWith("WixManagedBootstrapperApplicationHost"); + var isDNC = baId.StartsWith("WixDotNetCoreBootstrapperApplicationHost"); var isSCD = isDNC && this.VerifySCD(section); if (isStdBA || isMBA || isDNC) diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 484dd9e4..1629a670 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -9,6 +9,7 @@ namespace WixToolset.Bal using WixToolset.Data; using WixToolset.Data.Symbols; using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; /// /// The compiler for the WiX Toolset Bal Extension. @@ -17,6 +18,31 @@ namespace WixToolset.Bal { private readonly Dictionary prereqInfoSymbolsByPackageId; + private enum WixDotNetCoreBootstrapperApplicationHostTheme + { + Unknown, + None, + Standard, + } + + private enum WixManagedBootstrapperApplicationHostTheme + { + Unknown, + None, + Standard, + } + + private enum WixStandardBootstrapperApplicationTheme + { + Unknown, + HyperlinkLargeLicense, + HyperlinkLicense, + HyperlinkSidebarLicense, + None, + RtfLargeLicense, + RtfLicense, + } + /// /// Instantiate a new BalCompiler. /// @@ -54,7 +80,7 @@ namespace WixToolset.Bal break; } break; - case "BootstrapperApplicationRef": + case "BootstrapperApplication": switch (element.Name.LocalName) { case "WixStandardBootstrapperApplication": @@ -63,8 +89,8 @@ namespace WixToolset.Bal case "WixManagedBootstrapperApplicationHost": this.ParseWixManagedBootstrapperApplicationHostElement(intermediate, section, element); break; - case "WixDotNetCoreBootstrapperApplication": - this.ParseWixDotNetCoreBootstrapperApplicationElement(intermediate, section, element); + case "WixDotNetCoreBootstrapperApplicationHost": + this.ParseWixDotNetCoreBootstrapperApplicationHostElement(intermediate, section, element); break; default: this.ParseHelper.UnexpectedElement(parentElement, element); @@ -407,6 +433,7 @@ namespace WixToolset.Bal string licenseUrl = null; string logoFile = null; string logoSideFile = null; + WixStandardBootstrapperApplicationTheme? theme = null; string themeFile = null; string localizationFile = null; var suppressOptionsUI = YesNoType.NotSet; @@ -469,6 +496,34 @@ namespace WixToolset.Bal case "SupportCacheOnly": supportCacheOnly = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; + case "Theme": + var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (themeValue) + { + case "hyperlinkLargeLicense": + theme = WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense; + break; + case "hyperlinkLicense": + theme = WixStandardBootstrapperApplicationTheme.HyperlinkLicense; + break; + case "hyperlinkSidebarLicense": + theme = WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense; + break; + case "none": + theme = WixStandardBootstrapperApplicationTheme.None; + break; + case "rtfLargeLicense": + theme = WixStandardBootstrapperApplicationTheme.RtfLargeLicense; + break; + case "rtfLicense": + theme = WixStandardBootstrapperApplicationTheme.RtfLicense; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "hyperlinkLargeLicense", "hyperlinkLicense", "hyperlinkSidebarLicense", "none", "rtfLargeLicense", "rtfLicense")); + theme = WixStandardBootstrapperApplicationTheme.Unknown; // set a value to prevent expected attribute error below. + break; + } + break; default: this.ParseHelper.UnexpectedAttribute(node, attrib); break; @@ -482,13 +537,20 @@ namespace WixToolset.Bal this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - if (String.IsNullOrEmpty(licenseFile) && null == licenseUrl) + if (!theme.HasValue) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Theme")); + } + + if (theme != WixStandardBootstrapperApplicationTheme.None && String.IsNullOrEmpty(licenseFile) && null == licenseUrl) { this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true)); } if (!this.Messaging.EncounteredError) { + this.CreateBARef(section, sourceLineNumbers, node, "WixStandardBootstrapperApplication"); + if (!String.IsNullOrEmpty(launchTarget)) { section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) @@ -611,6 +673,31 @@ namespace WixToolset.Bal symbol.SupportCacheOnly = 1; } } + + string themePayloadGroup = null; + switch (theme) + { + case WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense: + themePayloadGroup = "WixStdbaHyperlinkLargeLicensePayloads"; + break; + case WixStandardBootstrapperApplicationTheme.HyperlinkLicense: + themePayloadGroup = "WixStdbaHyperlinkLicensePayloads"; + break; + case WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense: + themePayloadGroup = "WixStdbaHyperlinkSidebarLicensePayloads"; + break; + case WixStandardBootstrapperApplicationTheme.RtfLargeLicense: + themePayloadGroup = "WixStdbaRtfLargeLicensePayloads"; + break; + case WixStandardBootstrapperApplicationTheme.RtfLicense: + themePayloadGroup = "WixStdbaRtfLicensePayloads"; + break; + } + + if (themePayloadGroup != null) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup); + } } } @@ -624,6 +711,7 @@ namespace WixToolset.Bal string logoFile = null; string themeFile = null; string localizationFile = null; + WixManagedBootstrapperApplicationHostTheme? theme = null; foreach (var attrib in node.Attributes()) { @@ -640,6 +728,22 @@ namespace WixToolset.Bal case "LocalizationFile": localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); break; + case "Theme": + var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (themeValue) + { + case "none": + theme = WixManagedBootstrapperApplicationHostTheme.None; + break; + case "standard": + theme = WixManagedBootstrapperApplicationHostTheme.Standard; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "none", "standard")); + theme = WixManagedBootstrapperApplicationHostTheme.Unknown; + break; + } + break; default: this.ParseHelper.UnexpectedAttribute(node, attrib); break; @@ -655,6 +759,8 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { + this.CreateBARef(section, sourceLineNumbers, node, "WixManagedBootstrapperApplicationHost"); + if (!String.IsNullOrEmpty(logoFile)) { section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) @@ -678,6 +784,19 @@ namespace WixToolset.Bal Value = localizationFile, }); } + + string themePayloadGroup = null; + switch (theme) + { + case WixManagedBootstrapperApplicationHostTheme.Standard: + themePayloadGroup = "MbaPreqStandardPayloads"; + break; + } + + if (themePayloadGroup != null) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup); + } } } @@ -685,13 +804,14 @@ namespace WixToolset.Bal /// Parses a WixDotNetCoreBootstrapperApplication element for Bundles. /// /// The element to parse. - private void ParseWixDotNetCoreBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node) + private void ParseWixDotNetCoreBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node) { var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); string logoFile = null; string themeFile = null; string localizationFile = null; var selfContainedDeployment = YesNoType.NotSet; + WixDotNetCoreBootstrapperApplicationHostTheme? theme = null; foreach (var attrib in node.Attributes()) { @@ -711,6 +831,22 @@ namespace WixToolset.Bal case "SelfContainedDeployment": selfContainedDeployment = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); break; + case "Theme": + var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (themeValue) + { + case "none": + theme = WixDotNetCoreBootstrapperApplicationHostTheme.None; + break; + case "standard": + theme = WixDotNetCoreBootstrapperApplicationHostTheme.Standard; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "none", "standard")); + theme = WixDotNetCoreBootstrapperApplicationHostTheme.Unknown; + break; + } + break; default: this.ParseHelper.UnexpectedAttribute(node, attrib); break; @@ -722,10 +858,17 @@ namespace WixToolset.Bal } } + if (!theme.HasValue) + { + theme = WixDotNetCoreBootstrapperApplicationHostTheme.Standard; + } + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); if (!this.Messaging.EncounteredError) { + this.CreateBARef(section, sourceLineNumbers, node, "WixDotNetCoreBootstrapperApplicationHost"); + if (!String.IsNullOrEmpty(logoFile)) { section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) @@ -757,6 +900,33 @@ namespace WixToolset.Bal SelfContainedDeployment = 1, }); } + + string themePayloadGroup = null; + switch (theme) + { + case WixDotNetCoreBootstrapperApplicationHostTheme.Standard: + themePayloadGroup = "DncPreqStandardPayloads"; + break; + } + + if (themePayloadGroup != null) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup); + } + } + } + + private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name) + { + var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86); + if (id == null) + { + this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName)); + } + + if (!this.Messaging.EncounteredError) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBootstrapperApplication, id); } } } diff --git a/src/wixlib/BalExtension_platform.wxi b/src/wixlib/BalExtension_platform.wxi new file mode 100644 index 00000000..fa7d1182 --- /dev/null +++ b/src/wixlib/BalExtension_platform.wxi @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/BalExtension_x86.wxs b/src/wixlib/BalExtension_x86.wxs new file mode 100644 index 00000000..3cdd4015 --- /dev/null +++ b/src/wixlib/BalExtension_x86.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs index 9b5dc0ee..d777c473 100644 --- a/src/wixlib/Dnc.wxs +++ b/src/wixlib/Dnc.wxs @@ -6,54 +6,15 @@ Dnc.wxs - .NET Core BA resources. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - + + + + diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs index 4667904a..2d407c88 100644 --- a/src/wixlib/Mba.wxs +++ b/src/wixlib/Mba.wxs @@ -3,79 +3,41 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi new file mode 100644 index 00000000..b1711518 --- /dev/null +++ b/src/wixlib/caDecor.wxi @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/wixlib/caSuffix.wxi b/src/wixlib/caSuffix.wxi deleted file mode 100644 index 18436269..00000000 --- a/src/wixlib/caSuffix.wxi +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/wixstdba_platform.wxi b/src/wixlib/wixstdba_platform.wxi deleted file mode 100644 index fae52b80..00000000 --- a/src/wixlib/wixstdba_platform.wxi +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/wixstdba_x86.wxs b/src/wixlib/wixstdba_x86.wxs deleted file mode 100644 index e3ad07e8..00000000 --- a/src/wixlib/wixstdba_x86.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - -- cgit v1.2.3-55-g6feb From b9ba35486245a65cd8e376cc7a808f6fa7d41682 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 9 Dec 2020 12:51:21 -0600 Subject: WIXFEAT:6209 - Add x64 and ARM64 versions of built-in BAs. --- Bal.wixext.sln | 88 ++++++++++++++++++++-- appveyor.yml | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 16 ++++ src/dnchost/dnchost.vcxproj | 20 ++++- src/dnchost/dncutil.cpp | 6 +- src/dnchost/packages.config | 2 + src/mbahost/mbahost.vcxproj | 16 ++++ .../examples/TestEngine/Example.TestEngine.vcxproj | 8 ++ src/wixext/BalCompiler.cs | 2 +- src/wixlib/bal.wixproj | 22 +++++- src/wixstdba/wixstdba.vcxproj | 16 ++++ 11 files changed, 180 insertions(+), 18 deletions(-) (limited to 'src') diff --git a/Bal.wixext.sln b/Bal.wixext.sln index eaf23ba0..0b4c5afa 100644 --- a/Bal.wixext.sln +++ b/Bal.wixext.sln @@ -40,191 +40,263 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.ActiveCfg = Debug|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.Build.0 = Debug|Win32 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x64.ActiveCfg = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|ARM64.Build.0 = Debug|ARM64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x64.ActiveCfg = Debug|x64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x64.Build.0 = Debug|x64 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.ActiveCfg = Debug|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.Build.0 = Debug|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.ActiveCfg = Release|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.Build.0 = Release|Win32 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.ActiveCfg = Release|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|ARM64.ActiveCfg = Release|ARM64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|ARM64.Build.0 = Release|ARM64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.ActiveCfg = Release|x64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.Build.0 = Release|x64 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.ActiveCfg = Release|Win32 {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.Build.0 = Release|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.ActiveCfg = Debug|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.Build.0 = Debug|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.ActiveCfg = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|ARM64.Build.0 = Debug|ARM64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.ActiveCfg = Debug|x64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.Build.0 = Debug|x64 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.ActiveCfg = Debug|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.Build.0 = Debug|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.ActiveCfg = Release|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.Build.0 = Release|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.ActiveCfg = Release|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|ARM64.ActiveCfg = Release|ARM64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|ARM64.Build.0 = Release|ARM64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.ActiveCfg = Release|x64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.Build.0 = Release|x64 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.ActiveCfg = Release|Win32 {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.Build.0 = Release|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.ActiveCfg = Debug|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.Build.0 = Debug|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x64.ActiveCfg = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|ARM64.Build.0 = Debug|ARM64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x64.ActiveCfg = Debug|x64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x64.Build.0 = Debug|x64 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.ActiveCfg = Debug|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.Build.0 = Debug|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.ActiveCfg = Release|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.Build.0 = Release|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x64.ActiveCfg = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|ARM64.ActiveCfg = Release|ARM64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|ARM64.Build.0 = Release|ARM64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x64.ActiveCfg = Release|x64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x64.Build.0 = Release|x64 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.ActiveCfg = Release|Win32 {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.Build.0 = Release|Win32 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.ActiveCfg = Debug|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.Build.0 = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|ARM64.ActiveCfg = Debug|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x64.ActiveCfg = Debug|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.ActiveCfg = Debug|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.Build.0 = Debug|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.ActiveCfg = Release|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.Build.0 = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|ARM64.ActiveCfg = Release|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x64.ActiveCfg = Release|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.ActiveCfg = Release|x86 {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.Build.0 = Release|x86 {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|ARM64.Build.0 = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.ActiveCfg = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.Build.0 = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.ActiveCfg = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.Build.0 = Debug|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.ActiveCfg = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.Build.0 = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|ARM64.ActiveCfg = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|ARM64.Build.0 = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.ActiveCfg = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.Build.0 = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.ActiveCfg = Release|Any CPU {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.Build.0 = Release|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|ARM64.Build.0 = Debug|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x64.ActiveCfg = Debug|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x64.Build.0 = Debug|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x86.ActiveCfg = Debug|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x86.Build.0 = Debug|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|Any CPU.ActiveCfg = Release|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|Any CPU.Build.0 = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|ARM64.ActiveCfg = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|ARM64.Build.0 = Release|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x64.ActiveCfg = Release|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x64.Build.0 = Release|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x86.ActiveCfg = Release|Any CPU {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x86.Build.0 = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|ARM64.Build.0 = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.ActiveCfg = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.Build.0 = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.ActiveCfg = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.Build.0 = Debug|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.Build.0 = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|ARM64.ActiveCfg = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|ARM64.Build.0 = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.ActiveCfg = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.Build.0 = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.ActiveCfg = Release|Any CPU {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.Build.0 = Release|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|ARM64.Build.0 = Debug|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.ActiveCfg = Debug|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.Build.0 = Debug|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.ActiveCfg = Debug|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.Build.0 = Debug|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.ActiveCfg = Release|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.Build.0 = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|ARM64.ActiveCfg = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|ARM64.Build.0 = Release|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.ActiveCfg = Release|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.Build.0 = Release|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.ActiveCfg = Release|Any CPU {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.Build.0 = Release|Any CPU {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.ActiveCfg = Debug|Win32 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.Build.0 = Debug|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.Build.0 = Debug|ARM64 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.ActiveCfg = Debug|x64 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.Build.0 = Debug|x64 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.ActiveCfg = Debug|Win32 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.Build.0 = Debug|Win32 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.ActiveCfg = Release|Win32 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.Build.0 = Release|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.ActiveCfg = Release|ARM64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.Build.0 = Release|ARM64 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.ActiveCfg = Release|x64 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.Build.0 = Release|x64 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.ActiveCfg = Release|Win32 {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.Build.0 = Release|Win32 {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|ARM64.Build.0 = Debug|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.ActiveCfg = Debug|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.Build.0 = Debug|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.ActiveCfg = Debug|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.Build.0 = Debug|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.ActiveCfg = Release|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.Build.0 = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|ARM64.ActiveCfg = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|ARM64.Build.0 = Release|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.ActiveCfg = Release|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.Build.0 = Release|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.ActiveCfg = Release|Any CPU {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.Build.0 = Release|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|ARM64.Build.0 = Debug|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.ActiveCfg = Debug|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.Build.0 = Debug|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.ActiveCfg = Debug|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.Build.0 = Debug|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.ActiveCfg = Release|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.Build.0 = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|ARM64.ActiveCfg = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|ARM64.Build.0 = Release|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.ActiveCfg = Release|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.Build.0 = Release|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.ActiveCfg = Release|Any CPU {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.Build.0 = Release|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|ARM64.Build.0 = Debug|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x64.ActiveCfg = Debug|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x64.Build.0 = Debug|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x86.ActiveCfg = Debug|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x86.Build.0 = Debug|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Release|Any CPU.ActiveCfg = Release|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Release|Any CPU.Build.0 = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|ARM64.ActiveCfg = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|ARM64.Build.0 = Release|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.ActiveCfg = Release|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.Build.0 = Release|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.ActiveCfg = Release|Any CPU {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.Build.0 = Release|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|ARM64.Build.0 = Debug|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.ActiveCfg = Debug|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.Build.0 = Debug|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.ActiveCfg = Debug|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.Build.0 = Debug|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.Build.0 = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|ARM64.ActiveCfg = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|ARM64.Build.0 = Release|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.ActiveCfg = Release|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.Build.0 = Release|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.ActiveCfg = Release|Any CPU {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.Build.0 = Release|Any CPU {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.ActiveCfg = Debug|Win32 {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.Build.0 = Debug|Win32 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.ActiveCfg = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|ARM64.Build.0 = Debug|ARM64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.ActiveCfg = Debug|x64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.Build.0 = Debug|x64 {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.ActiveCfg = Debug|Win32 {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.Build.0 = Debug|Win32 {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.ActiveCfg = Release|Win32 {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.Build.0 = Release|Win32 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.ActiveCfg = Release|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|ARM64.ActiveCfg = Release|ARM64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|ARM64.Build.0 = Release|ARM64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.ActiveCfg = Release|x64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.Build.0 = Release|x64 {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.ActiveCfg = Release|Win32 {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.Build.0 = Release|Win32 {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|ARM64.Build.0 = Debug|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.ActiveCfg = Debug|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.Build.0 = Debug|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.ActiveCfg = Debug|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.Build.0 = Debug|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.Build.0 = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|ARM64.ActiveCfg = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|ARM64.Build.0 = Release|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.ActiveCfg = Release|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.Build.0 = Release|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.ActiveCfg = Release|Any CPU {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.Build.0 = Release|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|ARM64.Build.0 = Debug|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.ActiveCfg = Debug|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.Build.0 = Debug|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.ActiveCfg = Debug|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.Build.0 = Debug|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.ActiveCfg = Release|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.Build.0 = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|ARM64.ActiveCfg = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|ARM64.Build.0 = Release|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.ActiveCfg = Release|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.Build.0 = Release|Any CPU {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x86.ActiveCfg = Release|Any CPU diff --git a/appveyor.yml b/appveyor.yml index 147bd6aa..7c686b04 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -8,7 +8,7 @@ branches: - master - develop -image: Visual Studio 2019 Preview +image: Visual Studio 2019 version: 0.0.0.{build} configuration: Release diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 9e0aa581..755d0ca6 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -7,6 +7,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -15,6 +23,14 @@ Release Win32 + + Debug + x64 + + + Release + x64 + diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 419077ac..5959d6ea 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -8,6 +8,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -16,6 +24,14 @@ Release Win32 + + Debug + x64 + + + Release + x64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} @@ -28,7 +44,9 @@ - ..\..\packages\runtime.win-x86.Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-x86\native\ + $(Platform) + x86 + ..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\ shlwapi.lib;$(NetHostPath)libnethost.lib diff --git a/src/dnchost/dncutil.cpp b/src/dnchost/dncutil.cpp index 89fe707f..34d14911 100644 --- a/src/dnchost/dncutil.cpp +++ b/src/dnchost/dncutil.cpp @@ -37,7 +37,7 @@ static HRESULT LoadCoreClr( static HRESULT StartCoreClr( __in HOSTFXR_STATE* pState, __in LPCWSTR wzNativeHostPath, - __in size_t cProperties, + __in DWORD cProperties, __in LPCWSTR* propertyKeys, __in LPCWSTR* propertyValues ); @@ -320,7 +320,7 @@ static HRESULT InitializeCoreClrPre5( hr = LoadCoreClr(pState, sczCoreClrPath); BalExitOnFailure(hr, "Failed to load coreclr."); - hr = StartCoreClr(pState, wzNativeHostPath, cProperties, rgPropertyKeys, rgPropertyValues); + hr = StartCoreClr(pState, wzNativeHostPath, (DWORD)cProperties, rgPropertyKeys, rgPropertyValues); BalExitOnFailure(hr, "Failed to start coreclr."); LExit: @@ -358,7 +358,7 @@ LExit: static HRESULT StartCoreClr( __in HOSTFXR_STATE* pState, __in LPCWSTR wzNativeHostPath, - __in size_t cProperties, + __in DWORD cProperties, __in LPCWSTR* propertyKeys, __in LPCWSTR* propertyValues ) diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index af177833..cf40ae64 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -4,6 +4,8 @@ + + diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index e2cc562e..c05304d4 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -10,6 +10,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -18,6 +26,14 @@ Release Win32 + + Debug + x64 + + + Release + x64 + diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index 50fd7559..b420c18e 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -5,6 +5,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 1629a670..c01905cc 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -918,7 +918,7 @@ namespace WixToolset.Bal private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name) { - var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86); + var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); if (id == null) { this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName)); diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 38cdf242..8c88c3ce 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -9,14 +9,28 @@ - + + + - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 48d013a2..a9d518b4 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -10,6 +10,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -18,6 +26,14 @@ Release Win32 + + Debug + x64 + + + Release + x64 + -- cgit v1.2.3-55-g6feb From 5f00aece054d074fc651e542432f349e3055f582 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 15 Dec 2020 20:56:00 -0600 Subject: WIXFEAT:5267 - Skip bal:Conditions for special actions like layout. --- .../WixStandardBootstrapperApplication.cpp | 68 +++++++++++++--------- 1 file changed, 41 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 3fa7d8a6..59b23b19 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -311,11 +311,29 @@ public: // IBootstrapperApplication ) { HRESULT hr = S_OK; - - if (SUCCEEDED(hrStatus)) + // If we're not interacting with the user or we're doing a layout or we're resuming just after a force restart + // then automatically start planning. + BOOL fSkipToPlan = SUCCEEDED(hrStatus) && + (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || + BOOTSTRAPPER_ACTION_LAYOUT == m_command.action || + BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType); + // If we're requiring user input (which currently means Install, Repair, or Uninstall) + // or if we're skipping to an action that modifies machine state + // then evaluate conditions. + BOOL fEvaluateConditions = SUCCEEDED(hrStatus) && + (!fSkipToPlan || BOOTSTRAPPER_ACTION_LAYOUT < m_command.action && BOOTSTRAPPER_ACTION_UPDATE_REPLACE > m_command.action); + + if (fEvaluateConditions) { hrStatus = EvaluateConditions(); + } + if (FAILED(hrStatus)) + { + fSkipToPlan = FALSE; + } + else + { if (m_fPrereq) { m_fPrereqAlreadyInstalled = TRUE; @@ -336,32 +354,9 @@ public: // IBootstrapperApplication SetState(WIXSTDBA_STATE_DETECTED, hrStatus); - if (BOOTSTRAPPER_ACTION_CACHE == m_plannedAction) - { - if (m_fSupportCacheOnly) - { - // Doesn't make sense to prompt the user if cache only is requested. - if (BOOTSTRAPPER_DISPLAY_PASSIVE < m_command.display) - { - m_command.display = BOOTSTRAPPER_DISPLAY_PASSIVE; - } - - m_command.action = BOOTSTRAPPER_ACTION_CACHE; - } - else - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Ignoring attempt to only cache a bundle that does not explicitly support it."); - } - } - - // If we're not interacting with the user or we're doing a layout or we're just after a force restart - // then automatically start planning. - if (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_ACTION_LAYOUT == m_command.action || BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType) + if (fSkipToPlan) { - if (SUCCEEDED(hrStatus)) - { - ::PostMessageW(m_hWnd, WM_WIXSTDBA_PLAN_PACKAGES, 0, m_command.action); - } + ::PostMessageW(m_hWnd, WM_WIXSTDBA_PLAN_PACKAGES, 0, m_command.action); } return hr; @@ -2000,6 +1995,25 @@ private: // privates BalExitOnFailure(hr, "Failed to read bootstrapper application data."); } + if (BOOTSTRAPPER_ACTION_CACHE == m_plannedAction) + { + if (m_fSupportCacheOnly) + { + // Doesn't make sense to prompt the user if cache only is requested. + if (BOOTSTRAPPER_DISPLAY_PASSIVE < m_command.display) + { + m_command.display = BOOTSTRAPPER_DISPLAY_PASSIVE; + } + + m_command.action = BOOTSTRAPPER_ACTION_CACHE; + } + else + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Ignoring attempt to only cache a bundle that does not explicitly support it."); + m_plannedAction = BOOTSTRAPPER_ACTION_UNKNOWN; + } + } + LExit: ReleaseObject(pixdManifest); ReleaseStr(sczModulePath); -- cgit v1.2.3-55-g6feb From 045024c3b35e3bee44f33fbe0fb43a1704a18c5c Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 19 Dec 2020 19:56:38 -0600 Subject: Add the missing x64 wxs files and update dependencies. --- global.json | 2 +- src/CSharp.Build.props | 2 ++ src/Directory.Build.targets | 8 ++++++++ src/Samples/bafunctions/bafunctions.vcxproj | 4 ++-- src/Samples/bafunctions/packages.config | 2 +- src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 2 +- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 8 +------- src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | 4 ++++ src/WixToolset.Mba.Host/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 4 ++-- src/dnchost/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 4 ++-- src/mbahost/packages.config | 2 +- src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 4 ---- .../WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | 4 ---- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 4 ++-- src/test/examples/TestEngine/packages.config | 2 +- src/wixlib/BalExtension_arm64.wxs | 7 +++++++ src/wixlib/BalExtension_x64.wxs | 7 +++++++ src/wixlib/bal.wixproj | 2 +- src/wixstdba/packages.config | 2 +- src/wixstdba/wixstdba.vcxproj | 4 ++-- 22 files changed, 48 insertions(+), 34 deletions(-) create mode 100644 src/wixlib/BalExtension_arm64.wxs create mode 100644 src/wixlib/BalExtension_x64.wxs (limited to 'src') diff --git a/global.json b/global.json index d614f6f5..01b177c2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0172" + "WixToolset.Sdk": "4.0.0-build-0175" }, "sdk": { "allowPrerelease": false diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props index b12f4c6e..81d24ad1 100644 --- a/src/CSharp.Build.props +++ b/src/CSharp.Build.props @@ -5,7 +5,9 @@ --> + true true $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) + false diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index dac7452a..cb988931 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -9,6 +9,11 @@ See the original here: https://github.com/dotnet/sdk/issues/1151#issuecomment-385133284 --> + + false + $(OutputPath)\$(AssemblyName).xml + + true $(SolutionPath) @@ -45,4 +50,7 @@ + + + diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 755d0ca6..7f6c71a5 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,7 +2,7 @@ - + @@ -73,7 +73,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}. - + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index b078faf8..0f17a2f2 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index a79b3f96..8849ddbf 100644 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -3,7 +3,7 @@ - netcoreapp3.0 + netcoreapp3.1 WixToolset.Dnc.Host WiX Toolset .NET Core BA Host WiX Toolset .NET Core BA Host diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 7bda988c..69674b90 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -11,11 +11,9 @@ WixToolset.Mba.Host Library WixToolset.Mba.Host - 0693;1591 v2.0 Managed Bootstrapper Application entry point embedded - false true @@ -49,7 +47,7 @@ - ..\..\packages\WixToolset.Mba.Core.4.0.44\lib\net20\WixToolset.Mba.Core.dll + ..\..\packages\WixToolset.Mba.Core.4.0.45\lib\net20\WixToolset.Mba.Core.dll @@ -96,8 +94,4 @@ - - - $(OutputPath)\$(AssemblyName).xml - \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec index d1633cb0..f4f84847 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec @@ -10,6 +10,10 @@ false $description$ $copyright$ + + + + diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config index 6192f1b7..9e481965 100644 --- a/src/WixToolset.Mba.Host/packages.config +++ b/src/WixToolset.Mba.Host/packages.config @@ -4,5 +4,5 @@ - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 5959d6ea..18c2dcf3 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,7 +4,7 @@ - + @@ -96,7 +96,7 @@ - + diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index cf40ae64..bc4a6ca6 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index c05304d4..dc038be5 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,7 +5,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 4b6974b3..d0e0bc3e 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 199b82e2..c9ab4219 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -7,10 +7,6 @@ false - - NU1701 - - diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index 6542e77f..38c8926c 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -6,10 +6,6 @@ netcoreapp3.1 - - NU1701 - - diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index b420c18e..fa8925a8 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,7 +1,7 @@ - + @@ -76,7 +76,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}. - + diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index b078faf8..0f17a2f2 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/wixlib/BalExtension_arm64.wxs b/src/wixlib/BalExtension_arm64.wxs new file mode 100644 index 00000000..1b9e11d2 --- /dev/null +++ b/src/wixlib/BalExtension_arm64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/wixlib/BalExtension_x64.wxs b/src/wixlib/BalExtension_x64.wxs new file mode 100644 index 00000000..69a597ae --- /dev/null +++ b/src/wixlib/BalExtension_x64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 8c88c3ce..ba1a2349 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -7,7 +7,7 @@ - + diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 4b6974b3..d0e0bc3e 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index a9d518b4..d1de6404 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,7 +5,7 @@ - + @@ -94,7 +94,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - + -- cgit v1.2.3-55-g6feb From 32b3088eeaaf94eae561886a4235b13aa564a620 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 19 Dec 2020 20:25:55 -0600 Subject: Convert WixToolset.Mba.Host.csproj to SDK-style. --- src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs | 17 ------ src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 66 ++++------------------ src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | 4 +- src/WixToolset.Mba.Host/packages.config | 8 --- src/dnchost/dnchost.vcxproj | 3 + src/wixlib/bal.wixproj | 2 +- 6 files changed, 17 insertions(+), 83 deletions(-) delete mode 100644 src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs delete mode 100644 src/WixToolset.Mba.Host/packages.config (limited to 'src') diff --git a/src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs b/src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs deleted file mode 100644 index 8cee0ae9..00000000 --- a/src/WixToolset.Mba.Host/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,17 +0,0 @@ -// 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. - -using System; -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("Managed Bootstrapper Application Host (WiX)")] -[assembly: AssemblyDescription("Managed Bootstrapper Application Host")] -[assembly: AssemblyProduct("WiX Toolset")] -[assembly: AssemblyCompany("WiX Toolset Team")] -[assembly: AssemblyCopyright("Copyright (c) .NET Foundation and contributors. All rights reserved.")] - -// Types should not be visible to COM by default. -[assembly: ComVisible(false)] -[assembly: Guid("6f4e0cc9-8ad4-4b5a-a669-3aafff67a76f")] - -[assembly: CLSCompliantAttribute(true)] diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 69674b90..87b632d7 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -1,54 +1,26 @@ - - - - - + - {F2BA1935-70FA-4156-B161-FD03850B4FAA} WixToolset.Mba.Host - Library WixToolset.Mba.Host - v2.0 + net20 Managed Bootstrapper Application entry point embedded + $(MSBuildThisFileName).nuspec - - true - false - $(DefineConstants);DEBUG;TRACE - - - true - true - $(DefineConstants);TRACE - - - - - - - - - - - + - + - + + + - - - - - ..\..\packages\WixToolset.Mba.Core.4.0.45\lib\net20\WixToolset.Mba.Core.dll - @@ -56,8 +28,6 @@ - - @@ -74,24 +44,10 @@ - - - - - - - - - + - 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}. + $(OutputPath) + Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl) - - - - - - - \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec index f4f84847..00fd21ac 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec @@ -17,7 +17,7 @@ - - + + diff --git a/src/WixToolset.Mba.Host/packages.config b/src/WixToolset.Mba.Host/packages.config deleted file mode 100644 index 9e481965..00000000 --- a/src/WixToolset.Mba.Host/packages.config +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 18c2dcf3..4a534acc 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -72,6 +72,9 @@ $(BaseOutputPath)obj;$(NetHostPath);%(AdditionalIncludeDirectories) + + /LTCG %(AdditionalOptions) + diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index ba1a2349..fdcc7475 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj @@ -8,7 +8,7 @@ - + -- cgit v1.2.3-55-g6feb From 976534ee824bf2a5cbc86764d1edf595ac30087b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 20 Dec 2020 14:28:49 -0600 Subject: Force managed host projects to be AnyCpu. Update WixToolset.Bal.wixext to where it shouldn't rebuild during packing so the tests were run on the shipped code. Add 64-bit symbols and use x86 symbols to match the wixlib bind path. --- appveyor.cmd | 2 +- src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 1 + src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 1 + src/wixext/WixToolset.Bal.wixext.csproj | 2 +- src/wixext/WixToolset.Bal.wixext.nuspec | 4 +++- 5 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index fe525614..b3b08545 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -10,7 +10,7 @@ msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b -msbuild -p:Configuration=%_C% -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b +msbuild -p:Configuration=%_C% -p:SkipReferencesToPack=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b @popd diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj index 8849ddbf..f347ca0b 100644 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -8,6 +8,7 @@ WiX Toolset .NET Core BA Host WiX Toolset .NET Core BA Host embedded + AnyCPU diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 87b632d7..32d130bd 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -9,6 +9,7 @@ Managed Bootstrapper Application entry point embedded $(MSBuildThisFileName).nuspec + AnyCPU diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index c0a674da..6933e62a 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/wixext/WixToolset.Bal.wixext.nuspec b/src/wixext/WixToolset.Bal.wixext.nuspec index 011ba138..d9e704ae 100644 --- a/src/wixext/WixToolset.Bal.wixext.nuspec +++ b/src/wixext/WixToolset.Bal.wixext.nuspec @@ -19,6 +19,8 @@ - + + + -- cgit v1.2.3-55-g6feb From 611bf9ec74426c972b6b271cb51d81e467d990cd Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sun, 20 Dec 2020 17:04:26 -0600 Subject: Fix theme PayloadGroupRefs and BalBurnBackendExtension. --- src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 2 + src/wixext/BalBurnBackendExtension.cs | 6 +-- src/wixext/BalCompiler.cs | 41 ++++++----------- src/wixlib/BalExtension_platform.wxi | 52 ++++++++++++++++++++-- 4 files changed, 66 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs index 277a941a..2ff57c55 100644 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -42,6 +42,8 @@ namespace WixToolsetTest.Bal var balPackageInfos = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); var balPackageInfo = (XmlNode)Assert.Single(balPackageInfos); Assert.Equal("", balPackageInfo.GetTestXml()); + + Assert.True(File.Exists(Path.Combine(baFolderPath, "thm.wxl"))); } } diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index 7e481ee9..bf96e388 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -34,7 +34,7 @@ namespace WixToolset.Bal var intermediate = this.Context.IntermediateRepresentation; var section = intermediate.Sections.Single(); - var baSymbol = section.Symbols.OfType().SingleOrDefault(); + var baSymbol = section.Symbols.OfType().SingleOrDefault(); var baId = baSymbol?.Id?.Id; if (null == baId) { @@ -77,8 +77,8 @@ namespace WixToolset.Bal { foreach (var payloadPropertiesSymbol in payloadPropertiesSymbols) { - // TODO: Make core WiX canonicalize Name (this won't catch '.\bafunctions.dll'). - if (string.Equals(payloadPropertiesSymbol.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(payloadPropertiesSymbol.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase) && + BurnConstants.BurnUXContainerName == payloadPropertiesSymbol.ContainerRef) { this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesSymbol.SourceLineNumbers)); } diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index c01905cc..eab374ce 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -549,8 +549,6 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { - this.CreateBARef(section, sourceLineNumbers, node, "WixStandardBootstrapperApplication"); - if (!String.IsNullOrEmpty(launchTarget)) { section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) @@ -674,30 +672,27 @@ namespace WixToolset.Bal } } - string themePayloadGroup = null; + var baId = "WixStandardBootstrapperApplication"; switch (theme) { case WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense: - themePayloadGroup = "WixStdbaHyperlinkLargeLicensePayloads"; + baId = "WixStandardBootstrapperApplication.HyperlinkLargeLicense"; break; case WixStandardBootstrapperApplicationTheme.HyperlinkLicense: - themePayloadGroup = "WixStdbaHyperlinkLicensePayloads"; + baId = "WixStandardBootstrapperApplication.HyperlinkLicense"; break; case WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense: - themePayloadGroup = "WixStdbaHyperlinkSidebarLicensePayloads"; + baId = "WixStandardBootstrapperApplication.HyperlinkSidebarLicense"; break; case WixStandardBootstrapperApplicationTheme.RtfLargeLicense: - themePayloadGroup = "WixStdbaRtfLargeLicensePayloads"; + baId = "WixStandardBootstrapperApplication.RtfLargeLicense"; break; case WixStandardBootstrapperApplicationTheme.RtfLicense: - themePayloadGroup = "WixStdbaRtfLicensePayloads"; + baId = "WixStandardBootstrapperApplication.RtfLicense"; break; } - if (themePayloadGroup != null) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup); - } + this.CreateBARef(section, sourceLineNumbers, node, baId); } } @@ -759,8 +754,6 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { - this.CreateBARef(section, sourceLineNumbers, node, "WixManagedBootstrapperApplicationHost"); - if (!String.IsNullOrEmpty(logoFile)) { section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) @@ -785,18 +778,15 @@ namespace WixToolset.Bal }); } - string themePayloadGroup = null; + var baId = "WixManagedBootstrapperApplicationHost"; switch (theme) { case WixManagedBootstrapperApplicationHostTheme.Standard: - themePayloadGroup = "MbaPreqStandardPayloads"; + baId = "WixManagedBootstrapperApplicationHost.Standard"; break; } - if (themePayloadGroup != null) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup); - } + this.CreateBARef(section, sourceLineNumbers, node, baId); } } @@ -867,8 +857,6 @@ namespace WixToolset.Bal if (!this.Messaging.EncounteredError) { - this.CreateBARef(section, sourceLineNumbers, node, "WixDotNetCoreBootstrapperApplicationHost"); - if (!String.IsNullOrEmpty(logoFile)) { section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) @@ -901,18 +889,15 @@ namespace WixToolset.Bal }); } - string themePayloadGroup = null; + var baId = "WixDotNetCoreBootstrapperApplicationHost"; switch (theme) { case WixDotNetCoreBootstrapperApplicationHostTheme.Standard: - themePayloadGroup = "DncPreqStandardPayloads"; + baId = "WixDotNetCoreBootstrapperApplicationHost.Standard"; break; } - if (themePayloadGroup != null) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePayloadGroup, themePayloadGroup); - } + this.CreateBARef(section, sourceLineNumbers, node, baId); } } diff --git a/src/wixlib/BalExtension_platform.wxi b/src/wixlib/BalExtension_platform.wxi index fa7d1182..33122fb2 100644 --- a/src/wixlib/BalExtension_platform.wxi +++ b/src/wixlib/BalExtension_platform.wxi @@ -1,25 +1,69 @@ - + - + + + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3-55-g6feb From bd595d0beca939387b3639eb938a4810e53a8338 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 2 Jan 2021 16:00:28 -0600 Subject: Use proper way to pack without building. --- appveyor.cmd | 4 ++-- src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 2 +- src/wixext/WixToolset.Bal.wixext.csproj | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/appveyor.cmd b/appveyor.cmd index b3b08545..f4e9c26e 100644 --- a/appveyor.cmd +++ b/appveyor.cmd @@ -10,8 +10,8 @@ msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b -msbuild -p:Configuration=%_C% -p:SkipReferencesToPack=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b -msbuild -p:Configuration=%_C% -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b @popd @endlocal diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj index 32d130bd..3ee0ad1e 100644 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -45,7 +45,7 @@ - + $(OutputPath) Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl) diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj index 6933e62a..00451403 100644 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ b/src/wixext/WixToolset.Bal.wixext.csproj @@ -23,14 +23,14 @@ - + - + $(OutputPath)..\ $(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory) -- cgit v1.2.3-55-g6feb From 12b3db746300a6c279329baf2ad263a76abb8ef6 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Sat, 2 Jan 2021 16:01:36 -0600 Subject: Fix bug where default theme for MBA needs to be Standard. --- src/wixext/BalCompiler.cs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src') diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index eab374ce..441ad004 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -750,6 +750,11 @@ namespace WixToolset.Bal } } + if (!theme.HasValue) + { + theme = WixManagedBootstrapperApplicationHostTheme.Standard; + } + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); if (!this.Messaging.EncounteredError) -- cgit v1.2.3-55-g6feb From 4a74136e7bf4d861299accdf3302fdeb6df410f8 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 19 Jan 2021 17:05:35 -0600 Subject: Update dependencies. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 12 ++++++------ src/Samples/bafunctions/packages.config | 6 +++--- src/dnchost/dnchost.vcxproj | 12 ++++++------ src/dnchost/packages.config | 6 +++--- src/mbahost/mbahost.vcxproj | 12 ++++++------ src/mbahost/packages.config | 6 +++--- src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs | 4 ++-- src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs | 4 ++-- src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs | 4 ++-- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 12 ++++++------ src/test/examples/TestEngine/packages.config | 6 +++--- src/wixstdba/packages.config | 6 +++--- src/wixstdba/wixstdba.vcxproj | 12 ++++++------ 14 files changed, 52 insertions(+), 52 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 6b0e711a..1133d472 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0176" + "WixToolset.Sdk": "4.0.0-build-0179" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 7f6c71a5..2a85fe2f 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -73,9 +73,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 0f17a2f2..08a0433c 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 4a534acc..8c2bdc4b 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -99,8 +99,8 @@ - - - + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index bc4a6ca6..ec267ebd 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index dc038be5..28e142a9 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -99,8 +99,8 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index d0e0bc3e..7b1a6fe1 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs index 1b72c725..8c613acc 100644 --- a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + diff --git a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs index 5072b813..a647945d 100644 --- a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs @@ -1,4 +1,4 @@ - + @@ -7,7 +7,7 @@ - + diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs index 3ba305b5..1ca2e7ae 100644 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs @@ -1,4 +1,4 @@ - + @@ -6,7 +6,7 @@ - + diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index fa8925a8..c75c37ef 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -76,8 +76,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/packages.config b/src/test/examples/TestEngine/packages.config index 0f17a2f2..08a0433c 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/wixstdba/packages.config b/src/wixstdba/packages.config index d0e0bc3e..7b1a6fe1 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index d1de6404..50650950 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From c01cfd807219d3ea96ad171cdbe5dd9d4a4aced0 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 4 Feb 2021 21:38:19 -0600 Subject: Update dependencies. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 8 ++--- src/Samples/bafunctions/packages.config | 4 +-- src/dnchost/dnchost.vcxproj | 8 ++--- src/dnchost/packages.config | 4 +-- src/mbahost/mbahost.vcxproj | 8 ++--- src/mbahost/packages.config | 4 +-- .../WixToolsetTest.Bal/TestData/MBA/Bundle.wxs | 2 +- .../TestData/Overridable/Bundle.wxs | 2 +- .../TestData/WixStdBa/Bundle.wxs | 2 +- .../FrameworkDependentBundle.wxs | 2 +- .../EarliestCoreBundleSCD/SelfContainedBundle.wxs | 2 +- .../TrimmedSelfContainedBundle.wxs | 2 +- src/test/examples/FullFramework2Bundle/Bundle.wxs | 2 +- src/test/examples/FullFramework4Bundle/Bundle.wxs | 2 +- .../FrameworkDependentBundle.wxs | 2 +- .../LatestCoreBundleSCD/SelfContainedBundle.wxs | 2 +- .../TrimmedSelfContainedBundle.wxs | 2 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 8 ++--- src/test/examples/TestEngine/packages.config | 4 +-- .../WPFCoreBundleFDD/FrameworkDependentBundle.wxs | 2 +- .../WixStandardBootstrapperApplication.cpp | 38 ++-------------------- src/wixstdba/packages.config | 4 +-- src/wixstdba/wixstdba.mc | 7 ---- src/wixstdba/wixstdba.vcxproj | 8 ++--- 25 files changed, 45 insertions(+), 86 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 1133d472..f227ec06 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0179" + "WixToolset.Sdk": "4.0.0-build-0186" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 2a85fe2f..969edf8a 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -73,8 +73,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 08a0433c..4bf755e6 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 8c2bdc4b..e2438e36 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,8 +4,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index ec267ebd..44191bd4 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 28e142a9..2a8de2df 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 7b1a6fe1..1de666ea 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - + + \ No newline at end of file diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs index 8c613acc..ba1aefba 100644 --- a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs @@ -6,7 +6,7 @@ - + diff --git a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs index a647945d..91380c69 100644 --- a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs @@ -7,7 +7,7 @@ - + diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs index 1ca2e7ae..c17b53ff 100644 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs @@ -6,7 +6,7 @@ - + diff --git a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs index 2bea6d38..7d4c644f 100644 --- a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs index 4e4eb105..e3e04231 100644 --- a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs @@ -5,7 +5,7 @@ - + diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index 0bcd7755..f7042d51 100644 --- a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -5,7 +5,7 @@ - + diff --git a/src/test/examples/FullFramework2Bundle/Bundle.wxs b/src/test/examples/FullFramework2Bundle/Bundle.wxs index d0acd0e4..4f065eb0 100644 --- a/src/test/examples/FullFramework2Bundle/Bundle.wxs +++ b/src/test/examples/FullFramework2Bundle/Bundle.wxs @@ -8,7 +8,7 @@ - + diff --git a/src/test/examples/FullFramework4Bundle/Bundle.wxs b/src/test/examples/FullFramework4Bundle/Bundle.wxs index 8cb5b431..62b27bc1 100644 --- a/src/test/examples/FullFramework4Bundle/Bundle.wxs +++ b/src/test/examples/FullFramework4Bundle/Bundle.wxs @@ -8,7 +8,7 @@ - + diff --git a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs index 72c576b4..2fc603fb 100644 --- a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs index 5aa10f01..da0ae01f 100644 --- a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs @@ -5,7 +5,7 @@ - + diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index a9cf1ac7..a2110e21 100644 --- a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -5,7 +5,7 @@ - + diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj index c75c37ef..29865fee 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -76,8 +76,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/packages.config b/src/test/examples/TestEngine/packages.config index 08a0433c..4bf755e6 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/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs index 266a8ecc..9d5b7c13 100644 --- a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs @@ -10,7 +10,7 @@ - + diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 59b23b19..6418cb00 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -307,7 +307,8 @@ public: // IBootstrapperApplication virtual STDMETHODIMP OnDetectComplete( - __in HRESULT hrStatus + __in HRESULT hrStatus, + __in BOOL /*fEligibleForCleanup*/ ) { HRESULT hr = S_OK; @@ -1142,9 +1143,6 @@ public: // IBootstrapperApplication case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN: OnDetectPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE: - OnDetectCompatibleMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE: OnDetectRelatedMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; @@ -1163,12 +1161,6 @@ public: // IBootstrapperApplication case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN: OnPlanPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN: - OnPlanCompatibleMsiPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE: - OnPlanCompatibleMsiPackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE: OnPlanTargetMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; @@ -1408,14 +1400,6 @@ private: // privates m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); } - void OnDetectCompatibleMsiPackageFallback( - __in BA_ONDETECTCOMPATIBLEMSIPACKAGE_ARGS* pArgs, - __inout BA_ONDETECTCOMPATIBLEMSIPACKAGE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTCOMPATIBLEMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - void OnDetectRelatedMsiPackageFallback( __in BA_ONDETECTRELATEDMSIPACKAGE_ARGS* pArgs, __inout BA_ONDETECTRELATEDMSIPACKAGE_RESULTS* pResults @@ -1468,24 +1452,6 @@ private: // privates BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_PACKAGE, m_hModule, pArgs->wzPackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); } - void OnPlanCompatibleMsiPackageBeginFallback( - __in BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_ARGS* pArgs, - __inout BA_ONPLANCOMPATIBLEMSIPACKAGEBEGIN_RESULTS* pResults - ) - { - BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_COMPATIBLE_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, pArgs->wzCompatiblePackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); - } - - void OnPlanCompatibleMsiPackageCompleteFallback( - __in BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_ARGS* pArgs, - __inout BA_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPATIBLEMSIPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - void OnPlanTargetMsiPackageFallback( __in BA_ONPLANTARGETMSIPACKAGE_ARGS* pArgs, __inout BA_ONPLANTARGETMSIPACKAGE_RESULTS* pResults diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 7b1a6fe1..1de666ea 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.mc b/src/wixstdba/wixstdba.mc index 34f8f844..b420af39 100644 --- a/src/wixstdba/wixstdba.mc +++ b/src/wixstdba/wixstdba.mc @@ -50,13 +50,6 @@ Language=English WIXSTDBA: Planned related bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! . -MessageId=4 -Severity=Success -SymbolicName=MSG_WIXSTDBA_PLANNED_COMPATIBLE_MSI_PACKAGE -Language=English -WIXSTDBA: Planned compatible package: %2!ls! for %1!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs! -. - MessageId=5 Severity=Success SymbolicName=MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 50650950..03ad0f32 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From beaea7f50d598eb1cb4522ca35c74b46632c07b1 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 17 Feb 2021 15:17:07 -0600 Subject: Update dependencies. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 8 ++++---- src/Samples/bafunctions/packages.config | 4 ++-- src/dnchost/dnchost.vcxproj | 8 ++++---- src/dnchost/packages.config | 4 ++-- src/mbahost/mbahost.vcxproj | 8 ++++---- src/mbahost/packages.config | 4 ++-- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 8 ++++---- src/test/examples/TestEngine/packages.config | 4 ++-- src/wixstdba/packages.config | 4 ++-- src/wixstdba/wixstdba.vcxproj | 8 ++++---- 11 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index f227ec06..a4eb003d 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0186" + "WixToolset.Sdk": "4.0.0-build-0189" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 969edf8a..777e842d 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -3,8 +3,8 @@ - - + + @@ -74,8 +74,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 4bf755e6..53c662aa 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - + - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index e2438e36..68b33d16 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -5,8 +5,8 @@ - - + + Debug @@ -100,7 +100,7 @@ - - + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 44191bd4..228581dc 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -8,6 +8,6 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 2a8de2df..caefb68a 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -6,8 +6,8 @@ - - + + @@ -100,7 +100,7 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 1de666ea..43991015 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -5,6 +5,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 29865fee..08e0ad49 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -2,8 +2,8 @@ - - + + Debug @@ -77,7 +77,7 @@ - - + + \ No newline at end of file diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index 4bf755e6..53c662aa 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/wixstdba/packages.config b/src/wixstdba/packages.config index 1de666ea..43991015 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -5,6 +5,6 @@ - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 03ad0f32..242ccba3 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -6,8 +6,8 @@ - - + + @@ -95,7 +95,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From da29ddd42cf1e15de1f6332a7d17c598cd5a00d1 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 22 Feb 2021 20:42:00 -0600 Subject: Update dependencies. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 8 +-- src/Samples/bafunctions/packages.config | 4 +- src/dnchost/dnchost.vcxproj | 8 +-- src/dnchost/packages.config | 4 +- src/mbahost/mbahost.vcxproj | 8 +-- src/mbahost/packages.config | 4 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 8 +-- src/test/examples/TestEngine/packages.config | 4 +- .../WixStandardBootstrapperApplication.cpp | 57 +++++++++++----------- src/wixstdba/packages.config | 4 +- src/wixstdba/wixstdba.vcxproj | 8 +-- 12 files changed, 59 insertions(+), 60 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index a4eb003d..9492f867 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0189" + "WixToolset.Sdk": "4.0.0-build-0190" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 777e842d..9e51292e 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -73,8 +73,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 53c662aa..946209d8 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 68b33d16..9c04849c 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,8 +4,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 228581dc..f60d813a 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index caefb68a..4677d32a 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 43991015..584038b6 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - + + \ 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 08e0ad49..9f186450 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -76,8 +76,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/packages.config b/src/test/examples/TestEngine/packages.config index 53c662aa..946209d8 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/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 6418cb00..9c882dfa 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -383,6 +383,8 @@ public: // IBootstrapperApplication virtual STDMETHODIMP OnPlanPackageBegin( __in_z LPCWSTR wzPackageId, + __in BOOTSTRAPPER_PACKAGE_STATE state, + __in BOOL fInstallCondition, __in BOOTSTRAPPER_REQUEST_STATE recommendedState, __inout BOOTSTRAPPER_REQUEST_STATE *pRequestState, __inout BOOL* pfCancel @@ -392,7 +394,7 @@ public: // IBootstrapperApplication WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; BAL_INFO_PACKAGE* pPackage = NULL; - // If we're planning to install a prerequisite, install it. The prerequisite needs to be installed + // If we're planning to install prerequisites, install them. The prerequisites need to be installed // in all cases (even uninstall!) so the BA can load next. if (m_fPrereq) { @@ -401,21 +403,7 @@ public: // IBootstrapperApplication hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); if (SUCCEEDED(hr) && pPackage->fPrereqPackage && pPackageInfo) { - if (pPackage->sczInstallCondition && *pPackage->sczInstallCondition) - { - hr = BalEvaluateCondition(pPackage->sczInstallCondition, &fInstall); - if (FAILED(hr)) - { - fInstall = FALSE; - } - } - else - { - // If the InstallCondition is missing, then it should always be installed. - fInstall = TRUE; - } - - pPackageInfo->fPlannedToBeInstalled = fInstall; + pPackageInfo->fPlannedToBeInstalled = fInstall = fInstallCondition; } if (fInstall) @@ -449,7 +437,7 @@ public: // IBootstrapperApplication } } - return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, recommendedState, pRequestState, pfCancel); + return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fInstallCondition, recommendedState, pRequestState, pfCancel); } @@ -1146,8 +1134,8 @@ public: // IBootstrapperApplication case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE: OnDetectRelatedMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE: - OnDetectTargetMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET: + OnDetectPatchTargetFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE: OnDetectMsiFeatureFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); @@ -1161,8 +1149,8 @@ public: // IBootstrapperApplication case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN: OnPlanPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE: - OnPlanTargetMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET: + OnPlanPatchTargetFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE: OnPlanMsiFeatureFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); @@ -1293,6 +1281,9 @@ public: // IBootstrapperApplication case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE: OnSystemRestorePointCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDPACKAGE: + OnPlannedPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; default: BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message); m_pfnBAFunctionsProc((BA_FUNCTIONS_MESSAGE)message, pvArgs, pvResults, m_pvBAFunctionsProcContext); @@ -1408,12 +1399,12 @@ private: // privates m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); } - void OnDetectTargetMsiPackageFallback( - __in BA_ONDETECTTARGETMSIPACKAGE_ARGS* pArgs, - __inout BA_ONDETECTTARGETMSIPACKAGE_RESULTS* pResults + void OnDetectPatchTargetFallback( + __in BA_ONDETECTPATCHTARGET_ARGS* pArgs, + __inout BA_ONDETECTPATCHTARGET_RESULTS* pResults ) { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTTARGETMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext); } void OnDetectMsiFeatureFallback( @@ -1452,13 +1443,13 @@ private: // privates BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_PACKAGE, m_hModule, pArgs->wzPackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); } - void OnPlanTargetMsiPackageFallback( - __in BA_ONPLANTARGETMSIPACKAGE_ARGS* pArgs, - __inout BA_ONPLANTARGETMSIPACKAGE_RESULTS* pResults + void OnPlanPatchTargetFallback( + __in BA_ONPLANPATCHTARGET_ARGS* pArgs, + __inout BA_ONPLANPATCHTARGET_RESULTS* pResults ) { BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANTARGETMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext); BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, pArgs->wzProductCode, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); } @@ -1480,6 +1471,14 @@ private: // privates m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); } + void OnPlannedPackageFallback( + __in BA_ONPLANNEDPACKAGE_ARGS* pArgs, + __inout BA_ONPLANNEDPACKAGE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANNEDPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + void OnApplyBeginFallback( __in BA_ONAPPLYBEGIN_ARGS* pArgs, __inout BA_ONAPPLYBEGIN_RESULTS* pResults diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 43991015..584038b6 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 242ccba3..7bd7d10f 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 8a47981860da38b85a32c59aab019015e4f97360 Mon Sep 17 00:00:00 2001 From: Andrij Abyzov Date: Tue, 2 Mar 2021 15:04:57 +0100 Subject: Use SymbolsFinalized instead of BundleFinalize --- src/wixext/BalBurnBackendExtension.cs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index bf96e388..5e647b1c 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -11,7 +11,7 @@ namespace WixToolset.Bal using WixToolset.Data.Symbols; using WixToolset.Extensibility; - public class BalBurnBackendExtension : BaseBurnBackendExtension + public class BalBurnBackendExtension : BaseBurnBackendBinderExtension { private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions = { @@ -27,12 +27,9 @@ namespace WixToolset.Bal protected override IEnumerable SymbolDefinitions => BurnSymbolDefinitions; - public override void BundleFinalize() + public override void SymbolsFinalized(IntermediateSection section) { - base.BundleFinalize(); - - var intermediate = this.Context.IntermediateRepresentation; - var section = intermediate.Sections.Single(); + base.SymbolsFinalized(section); var baSymbol = section.Symbols.OfType().SingleOrDefault(); var baId = baSymbol?.Id?.Id; -- cgit v1.2.3-55-g6feb From 8ec8f5b0091fce08be88acee1f49dbf2edf040a9 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Tue, 2 Mar 2021 17:26:47 -0600 Subject: Update dependencies and integrate changes. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 12 +++---- src/Samples/bafunctions/packages.config | 6 ++-- src/dnchost/dnchost.cpp | 23 ++----------- src/dnchost/dnchost.vcxproj | 12 +++---- src/dnchost/packages.config | 6 ++-- src/mbahost/mbahost.vcxproj | 12 +++---- src/mbahost/packages.config | 6 ++-- .../examples/TestEngine/Example.TestEngine.vcxproj | 12 +++---- src/test/examples/TestEngine/packages.config | 6 ++-- src/wixext/BalBurnBackendExtension.cs | 24 ++++++++++++++ src/wixext/BalCompiler.cs | 38 +++++++++++----------- .../Symbols/WixBalBAFactoryAssemblySymbol.cs | 8 +++++ src/wixstdba/packages.config | 6 ++-- src/wixstdba/wixstdba.vcxproj | 12 +++---- 15 files changed, 99 insertions(+), 86 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 34e8e7e6..137c0ebf 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0192" + "WixToolset.Sdk": "4.0.0-build-0193" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 9e51292e..53a3ccb9 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -73,9 +73,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 946209d8..8b492f22 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/dnchost/dnchost.cpp b/src/dnchost/dnchost.cpp index 503537c0..8ca326fc 100644 --- a/src/dnchost/dnchost.cpp +++ b/src/dnchost/dnchost.cpp @@ -169,9 +169,6 @@ static HRESULT LoadDncConfiguration( HRESULT hr = S_OK; IXMLDOMDocument* pixdManifest = NULL; IXMLDOMNode* pixnHost = NULL; - IXMLDOMNode* pixnPayload = NULL; - LPWSTR sczPayloadId = NULL; - LPWSTR sczPayloadXPath = NULL; LPWSTR sczPayloadName = NULL; DWORD dwBool = 0; @@ -187,21 +184,8 @@ static HRESULT LoadDncConfiguration( BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config."); } - hr = XmlGetAttributeEx(pixnHost, L"PayloadId", &sczPayloadId); - BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@PayloadId."); - - hr = StrAllocFormatted(&sczPayloadXPath, L"/BootstrapperApplicationData/WixPayloadProperties[@Payload='%ls']", sczPayloadId); - BalExitOnFailure(hr, "Failed to format BAFactoryAssembly payload XPath."); - - hr = XmlSelectSingleNode(pixdManifest, sczPayloadXPath, &pixnPayload); - if (S_FALSE == hr) - { - hr = E_NOTFOUND; - } - BalExitOnFailure(hr, "Failed to find WixPayloadProperties node for BAFactoryAssembly PayloadId: %ls.", sczPayloadId); - - hr = XmlGetAttributeEx(pixnPayload, L"Name", &sczPayloadName); - BalExitOnFailure(hr, "Failed to get BAFactoryAssembly payload Name."); + hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName); + BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath."); hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath); BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath."); @@ -250,9 +234,6 @@ static HRESULT LoadDncConfiguration( LExit: ReleaseStr(sczPayloadName); - ReleaseObject(pixnPayload); - ReleaseStr(sczPayloadXPath); - ReleaseStr(sczPayloadId); ReleaseObject(pixnHost); ReleaseObject(pixdManifest); diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 9c04849c..c5b6b416 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -99,8 +99,8 @@ - - - + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index f60d813a..61787995 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 4677d32a..7df76c02 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -99,8 +99,8 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 584038b6..71960076 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - - + + + \ 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 9f186450..0a669452 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -76,8 +76,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/packages.config b/src/test/examples/TestEngine/packages.config index 946209d8..8b492f22 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/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index 5e647b1c..6e639c1b 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -43,6 +43,11 @@ namespace WixToolset.Bal var isDNC = baId.StartsWith("WixDotNetCoreBootstrapperApplicationHost"); var isSCD = isDNC && this.VerifySCD(section); + if (isDNC) + { + this.FinalizeBAFactorySymbol(section); + } + if (isStdBA || isMBA || isDNC) { this.VerifyBAFunctions(section); @@ -54,6 +59,25 @@ namespace WixToolset.Bal } } + private void FinalizeBAFactorySymbol(IntermediateSection section) + { + var factorySymbol = section.Symbols.OfType().SingleOrDefault(); + if (null == factorySymbol) + { + return; + } + + var factoryPayloadSymbol = section.Symbols.OfType() + .Where(p => p.Id.Id == factorySymbol.PayloadId) + .SingleOrDefault(); + if (null == factoryPayloadSymbol) + { + return; + } + + factorySymbol.FilePath = factoryPayloadSymbol.Name; + } + private void VerifyBAFunctions(IntermediateSection section) { WixBalBAFunctionsSymbol baFunctionsSymbol = null; diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs index 441ad004..267345e7 100644 --- a/src/wixext/BalCompiler.cs +++ b/src/wixext/BalCompiler.cs @@ -136,7 +136,7 @@ namespace WixToolset.Bal case "MsiPackage": case "MspPackage": var displayInternalUICondition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); - section.AddSymbol(new WixBalPackageInfoSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, packageId)) + section.AddSymbol(new WixBalPackageInfoSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, packageId)) { PackageId = packageId, DisplayInternalUICondition = displayInternalUICondition, @@ -247,7 +247,7 @@ namespace WixToolset.Bal if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) { // There can only be one. - var id = new Identifier(AccessModifier.Public, "TheBAFactoryAssembly"); + var id = new Identifier(AccessModifier.Global, "TheBAFactoryAssembly"); section.AddSymbol(new WixBalBAFactoryAssemblySymbol(sourceLineNumbers, id) { PayloadId = payloadId, @@ -551,7 +551,7 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(launchTarget)) { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTarget")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTarget")) { Value = launchTarget, Type = WixBundleVariableType.Formatted, @@ -560,7 +560,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchTargetElevatedId)) { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchTargetElevatedId")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTargetElevatedId")) { Value = launchTargetElevatedId, Type = WixBundleVariableType.Formatted, @@ -569,7 +569,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchArguments)) { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchArguments")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchArguments")) { Value = launchArguments, Type = WixBundleVariableType.Formatted, @@ -578,7 +578,7 @@ namespace WixToolset.Bal if (YesNoType.Yes == launchHidden) { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchHidden")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchHidden")) { Value = "yes", Type = WixBundleVariableType.Formatted, @@ -588,7 +588,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(launchWorkingDir)) { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "LaunchWorkingFolder")) + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchWorkingFolder")) { Value = launchWorkingDir, Type = WixBundleVariableType.Formatted, @@ -597,7 +597,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(licenseFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseRtf")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseRtf")) { Value = licenseFile, }); @@ -605,7 +605,7 @@ namespace WixToolset.Bal if (null != licenseUrl) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLicenseUrl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseUrl")) { Value = licenseUrl, }); @@ -613,7 +613,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(logoFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogo")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogo")) { Value = logoFile, }); @@ -621,7 +621,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(logoSideFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaLogoSide")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogoSide")) { Value = logoSideFile, }); @@ -629,7 +629,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(themeFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeXml")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeXml")) { Value = themeFile, }); @@ -637,7 +637,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(localizationFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "WixStdbaThemeWxl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeWxl")) { Value = localizationFile, }); @@ -761,7 +761,7 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(logoFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaLogo")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaLogo")) { Value = logoFile, }); @@ -769,7 +769,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(themeFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeXml")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeXml")) { Value = themeFile, }); @@ -777,7 +777,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(localizationFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "PreqbaThemeWxl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeWxl")) { Value = localizationFile, }); @@ -864,7 +864,7 @@ namespace WixToolset.Bal { if (!String.IsNullOrEmpty(logoFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaLogo")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaLogo")) { Value = logoFile, }); @@ -872,7 +872,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(themeFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeXml")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeXml")) { Value = themeFile, }); @@ -880,7 +880,7 @@ namespace WixToolset.Bal if (!String.IsNullOrEmpty(localizationFile)) { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Public, "DncPreqbaThemeWxl")) + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeWxl")) { Value = localizationFile, }); diff --git a/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs b/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs index 0423a52f..52042e4c 100644 --- a/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs +++ b/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs @@ -12,6 +12,7 @@ namespace WixToolset.Bal new[] { new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.FilePath), IntermediateFieldType.String), }, typeof(WixBalBAFactoryAssemblySymbol)); } @@ -24,6 +25,7 @@ namespace WixToolset.Bal.Symbols public enum WixBalBAFactorySymbolFields { PayloadId, + FilePath, } public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol @@ -43,5 +45,11 @@ namespace WixToolset.Bal.Symbols get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString(); set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value); } + + public string FilePath + { + get => this.Fields[(int)WixBalBAFactorySymbolFields.FilePath].AsString(); + set => this.Set((int)WixBalBAFactorySymbolFields.FilePath, value); + } } } \ No newline at end of file diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 584038b6..71960076 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 7bd7d10f..e83d60f2 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 7c55f8cb364da0fe066078a1c68c9bb05a40cd8a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 3 Mar 2021 22:33:16 -0600 Subject: Update dependencies. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 4 ++-- src/Samples/bafunctions/packages.config | 2 +- src/dnchost/dnchost.vcxproj | 4 ++-- src/dnchost/packages.config | 2 +- src/mbahost/mbahost.vcxproj | 4 ++-- src/mbahost/packages.config | 2 +- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 4 ++-- src/test/examples/TestEngine/packages.config | 2 +- src/wixstdba/packages.config | 2 +- src/wixstdba/wixstdba.vcxproj | 4 ++-- 11 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 137c0ebf..2e158a40 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0193" + "WixToolset.Sdk": "4.0.0-build-0194" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 53a3ccb9..4883080a 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,7 +2,7 @@ - + @@ -73,7 +73,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}. - + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 8b492f22..57590429 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index c5b6b416..3e996869 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,7 +4,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 61787995..3e670980 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 7df76c02..82c60f33 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,7 +5,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 71960076..9e3d1dd3 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - + \ 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 0a669452..67ebe094 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,7 +1,7 @@ - + @@ -76,7 +76,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}. - + diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config index 8b492f22..57590429 100644 --- a/src/test/examples/TestEngine/packages.config +++ b/src/test/examples/TestEngine/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 71960076..9e3d1dd3 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index e83d60f2..8b887195 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,7 +5,7 @@ - + @@ -94,7 +94,7 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - + -- cgit v1.2.3-55-g6feb From 88ef687ebdad49eaacf729a554c894181ce23ac9 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 11 Mar 2021 20:18:06 -0600 Subject: Integrate ForwardCompatible and RelatedBundle changes. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 8 +++--- src/Samples/bafunctions/packages.config | 4 +-- src/dnchost/dnchost.vcxproj | 8 +++--- src/dnchost/packages.config | 4 +-- src/mbahost/mbahost.vcxproj | 8 +++--- src/mbahost/packages.config | 4 +-- .../examples/TestEngine/Example.TestEngine.vcxproj | 8 +++--- src/test/examples/TestEngine/packages.config | 4 +-- .../WixStandardBootstrapperApplication.cpp | 33 +++++++++++++++------- src/wixstdba/packages.config | 4 +-- src/wixstdba/wixstdba.mc | 4 +-- src/wixstdba/wixstdba.vcxproj | 8 +++--- 13 files changed, 56 insertions(+), 43 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 2e158a40..627b9889 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0194" + "WixToolset.Sdk": "4.0.0-build-0196" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 4883080a..06ad6be9 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -73,8 +73,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 57590429..767ba41a 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 3e996869..7a6d3dfc 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,8 +4,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 3e670980..fe8bccf7 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 82c60f33..efe85148 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 9e3d1dd3..2e2ba66e 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - + + \ 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 67ebe094..ca7d0434 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -76,8 +76,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/packages.config b/src/test/examples/TestEngine/packages.config index 57590429..767ba41a 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/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 9c882dfa..0fcf3a21 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -266,22 +266,27 @@ public: // IBootstrapperApplication __in BOOL fPerMachine, __in LPCWSTR wzVersion, __in BOOTSTRAPPER_RELATED_OPERATION operation, + __in BOOL fMissingFromCache, __inout BOOL* pfCancel ) { BAL_INFO_PACKAGE* pPackage = NULL; - if (SUCCEEDED(BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine, &pPackage))) - { - InitializePackageInfoForPackage(pPackage); - } - // If we're not doing a prerequisite install, remember when our bundle would cause a downgrade. - if (!m_fPrereq && BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE == operation) + if (!fMissingFromCache) { - m_fDowngrading = TRUE; + if (SUCCEEDED(BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine, &pPackage))) + { + InitializePackageInfoForPackage(pPackage); + } + + // If we're not doing a prerequisite install, remember when our bundle would cause a downgrade. + if (!m_fPrereq && BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE == operation) + { + m_fDowngrading = TRUE; + } } - return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, operation, pfCancel); + return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, operation, fMissingFromCache, pfCancel); } @@ -1346,9 +1351,7 @@ private: // privates __inout BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults ) { - BOOL fIgnoreBundle = pResults->fIgnoreBundle; m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); - BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_DETECTED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleId, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable"); } void OnDetectUpdateBeginFallback( @@ -1811,6 +1814,16 @@ private: // privates m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); } + void OnPlanForwardCompatibleBundleFallback( + __in BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs, + __inout BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults + ) + { + BOOL fIgnoreBundle = pResults->fIgnoreBundle; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleId, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable"); + } + // // UiThreadProc - entrypoint for UI thread. // diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 9e3d1dd3..2e2ba66e 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.mc b/src/wixstdba/wixstdba.mc index b420af39..688b1da1 100644 --- a/src/wixstdba/wixstdba.mc +++ b/src/wixstdba/wixstdba.mc @@ -31,9 +31,9 @@ LanguageNames=(English=0x409:MSG00409) MessageId=1 Severity=Success -SymbolicName=MSG_WIXSTDBA_DETECTED_FORWARD_COMPATIBLE_BUNDLE +SymbolicName=MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE Language=English -WIXSTDBA: Detected forward compatible bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! +WIXSTDBA: Planned forward compatible bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! . MessageId=2 diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 8b887195..76333fa4 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 8839cd031fc29f0760f39421330597455a148635 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 31 Mar 2021 12:42:29 -0500 Subject: Update to latest Sdk. --- global.json | 2 +- src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs | 2 +- src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs | 2 +- .../EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs | 2 +- src/test/examples/FullFramework2Bundle/Bundle.wxs | 2 +- src/test/examples/FullFramework4Bundle/Bundle.wxs | 2 +- src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs | 2 +- src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs | 2 +- .../examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs | 2 +- src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 627b9889..a6bc92d7 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0196" + "WixToolset.Sdk": "4.0.0-build-0203" }, "sdk": { "allowPrerelease": false diff --git a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs index 7d4c644f..d146845c 100644 --- a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs index e3e04231..4d872317 100644 --- a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs @@ -5,7 +5,7 @@ - + diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index f7042d51..ba7dce25 100644 --- a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -5,7 +5,7 @@ - + diff --git a/src/test/examples/FullFramework2Bundle/Bundle.wxs b/src/test/examples/FullFramework2Bundle/Bundle.wxs index 4f065eb0..f0af975c 100644 --- a/src/test/examples/FullFramework2Bundle/Bundle.wxs +++ b/src/test/examples/FullFramework2Bundle/Bundle.wxs @@ -8,7 +8,7 @@ - + diff --git a/src/test/examples/FullFramework4Bundle/Bundle.wxs b/src/test/examples/FullFramework4Bundle/Bundle.wxs index 62b27bc1..7b7cbf57 100644 --- a/src/test/examples/FullFramework4Bundle/Bundle.wxs +++ b/src/test/examples/FullFramework4Bundle/Bundle.wxs @@ -8,7 +8,7 @@ - + diff --git a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs index 2fc603fb..d5b543e8 100644 --- a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -10,7 +10,7 @@ - + diff --git a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs index da0ae01f..bedf0326 100644 --- a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs +++ b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs @@ -5,7 +5,7 @@ - + diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs index a2110e21..6059f8c1 100644 --- a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -5,7 +5,7 @@ - + diff --git a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs index 9d5b7c13..68d742b0 100644 --- a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs +++ b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs @@ -10,7 +10,7 @@ - + -- cgit v1.2.3-55-g6feb From dd04895571894674e356cce1cab259758e9a87f2 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 12 Apr 2021 10:55:43 -0700 Subject: Release taskbar before COM uninitialized to prevent crash Fixes wixtoolset/issues#5966 --- src/wixstdba/WixStandardBootstrapperApplication.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 0fcf3a21..f690c1a6 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -1894,6 +1894,7 @@ private: // privates LExit: // destroy main window pThis->DestroyMainWindow(); + pThis->UninitializeTaskbarButton(); // initiate engine shutdown DWORD dwQuit = HRESULT_CODE(hr); @@ -2556,6 +2557,17 @@ private: // privates } } + + // + // UninitializeTaskbarButton - clean up the taskbar registration. + // + void UninitializeTaskbarButton() + { + m_fTaskbarButtonOK = FALSE; + ReleaseNullObject(m_pTaskbarList); + } + + static LRESULT CallDefaultWndProc( __in CWixStandardBootstrapperApplication* pBA, __in HWND hWnd, @@ -3857,6 +3869,7 @@ public: ~CWixStandardBootstrapperApplication() { AssertSz(!::IsWindow(m_hWnd), "Window should have been destroyed before destructor."); + AssertSz(!m_pTaskbarList, "Taskbar should have been released before destructor."); AssertSz(!m_pTheme, "Theme should have been released before destructor."); for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) @@ -3865,7 +3878,6 @@ public: } ::DeleteCriticalSection(&m_csShowingInternalUiThisPackage); - ReleaseObject(m_pTaskbarList); ReleaseDict(m_sdOverridableVariables); ReleaseStr(m_sczFailedMessage); ReleaseStr(m_sczConfirmCloseMessage); -- cgit v1.2.3-55-g6feb From 559dbc8dc9c1e3bfe03c0257c6e396cec87a9b6a Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 15 Apr 2021 18:17:38 -0500 Subject: Update dependencies. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 12 ++++++------ src/Samples/bafunctions/packages.config | 6 +++--- src/dnchost/dnchost.vcxproj | 12 ++++++------ src/dnchost/packages.config | 6 +++--- src/mbahost/mbahost.vcxproj | 12 ++++++------ src/mbahost/packages.config | 6 +++--- src/test/examples/TestEngine/Example.TestEngine.vcxproj | 12 ++++++------ src/test/examples/TestEngine/packages.config | 6 +++--- src/wixstdba/WixStandardBootstrapperApplication.cpp | 8 ++++---- src/wixstdba/packages.config | 6 +++--- src/wixstdba/wixstdba.vcxproj | 12 ++++++------ 12 files changed, 50 insertions(+), 50 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index 6df1b3ab..e30536fb 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0206" + "WixToolset.Sdk": "4.0.0-build-0209" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 06ad6be9..559cfea6 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -73,9 +73,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 767ba41a..4d2086b2 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 7a6d3dfc..9acf5627 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -99,8 +99,8 @@ - - - + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index fe8bccf7..af4b54a2 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index efe85148..771307ec 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -99,8 +99,8 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index 2e2ba66e..cf236703 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - - + + + \ 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 ca7d0434..a4645666 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -76,8 +76,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/packages.config b/src/test/examples/TestEngine/packages.config index 767ba41a..4d2086b2 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/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index f690c1a6..8b4b89a1 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -2095,7 +2095,7 @@ private: // privates LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl"; // Find and load .wxl file. - hr = LocProbeForFile(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath); + hr = LocProbeForFileEx(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath, TRUE); BalExitOnFailure(hr, "Failed to probe for loc file: %ls in path: %ls", wzLocFileName, wzModulePath); hr = LocLoadFromFile(sczLocPath, &m_pWixLoc); @@ -2142,7 +2142,7 @@ private: // privates LPWSTR sczThemePath = NULL; LPCWSTR wzThemeFileName = m_fPrereq ? L"mbapreq.thm" : L"thm.xml"; - hr = LocProbeForFile(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath); + hr = LocProbeForFileEx(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath, TRUE); BalExitOnFailure(hr, "Failed to probe for theme file: %ls in path: %ls", wzThemeFileName, wzModulePath); hr = ThemeLoadFromFile(sczThemePath, &m_pTheme); @@ -2808,7 +2808,7 @@ private: // privates hr = StrAllocString(&sczLicenseFilename, PathFile(sczLicenseFormatted), 0); if (SUCCEEDED(hr)) { - hr = LocProbeForFile(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath); + hr = LocProbeForFileEx(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath, TRUE); if (SUCCEEDED(hr)) { hr = ThemeLoadRichEditFromFile(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT, sczLicensePath, m_hModule); @@ -3325,7 +3325,7 @@ private: // privates hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); if (SUCCEEDED(hr)) { - hr = LocProbeForFile(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath); + hr = LocProbeForFileEx(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath, TRUE); } } } diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index 2e2ba66e..cf236703 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 76333fa4..e484da0c 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 1fb8dc635834c5b9f24b898a291734d7bd136ad4 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 19 Apr 2021 18:27:49 -0500 Subject: Replace OnResolveSource with OnCacheAcquireResolving. #3640 --- src/Samples/bafunctions/bafunctions.vcxproj | 8 +-- src/Samples/bafunctions/packages.config | 4 +- src/dnchost/dnchost.vcxproj | 8 +-- src/dnchost/packages.config | 4 +- src/mbahost/mbahost.vcxproj | 8 +-- src/mbahost/packages.config | 4 +- .../examples/TestEngine/Example.TestEngine.vcxproj | 8 +-- src/test/examples/TestEngine/packages.config | 4 +- .../WixStandardBootstrapperApplication.cpp | 81 ++++++++++------------ src/wixstdba/packages.config | 4 +- src/wixstdba/wixstdba.vcxproj | 8 +-- 11 files changed, 67 insertions(+), 74 deletions(-) (limited to 'src') diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 559cfea6..69914bab 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,8 +2,8 @@ - - + + @@ -73,8 +73,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}. - - + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index 4d2086b2..be5b9f7f 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 9acf5627..51a12d8d 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,8 +4,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index af4b54a2..3767d555 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index 771307ec..b016159c 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -99,8 +99,8 @@ - - + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index cf236703..ebb9d908 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - + + \ 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 a4645666..e93cacac 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,8 +1,8 @@ - - + + @@ -76,8 +76,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/packages.config b/src/test/examples/TestEngine/packages.config index 4d2086b2..be5b9f7f 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/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 8b4b89a1..23fded79 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -945,55 +945,48 @@ public: // IBootstrapperApplication } - virtual STDMETHODIMP OnResolveSource( - __in_z LPCWSTR wzPackageOrContainerId, + virtual STDMETHODIMP OnCacheAcquireResolving( + __in_z_opt LPCWSTR wzPackageOrContainerId, __in_z_opt LPCWSTR wzPayloadId, - __in_z LPCWSTR wzLocalSource, - __in_z_opt LPCWSTR wzDownloadSource, - __in BOOTSTRAPPER_RESOLVESOURCE_ACTION /*recommendation*/, - __inout BOOTSTRAPPER_RESOLVESOURCE_ACTION* pAction, + __in_z LPCWSTR* rgSearchPaths, + __in DWORD /*cSearchPaths*/, + __in BOOL /*fFoundLocal*/, + __in DWORD dwRecommendedSearchPath, + __in_z_opt LPCWSTR /*wzDownloadUrl*/, + __in_z_opt LPCWSTR /*wzPayloadContainerId*/, + __in BOOTSTRAPPER_CACHE_RESOLVE_OPERATION /*recommendation*/, + __inout DWORD* /*pdwChosenSearchPath*/, + __inout BOOTSTRAPPER_CACHE_RESOLVE_OPERATION* pAction, __inout BOOL* pfCancel ) { HRESULT hr = S_OK; - if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display) + if (BOOTSTRAPPER_CACHE_RESOLVE_NONE == *pAction && BOOTSTRAPPER_DISPLAY_FULL == m_command.display) // prompt to change the source location. { - if (wzDownloadSource) - { - *pAction = BOOTSTRAPPER_RESOLVESOURCE_ACTION_DOWNLOAD; - } - else // prompt to change the source location. - { - OPENFILENAMEW ofn = { }; - WCHAR wzFile[MAX_PATH] = { }; + OPENFILENAMEW ofn = { }; + WCHAR wzFile[MAX_PATH] = { }; - ::StringCchCopyW(wzFile, countof(wzFile), wzLocalSource); + ::StringCchCopyW(wzFile, countof(wzFile), rgSearchPaths[dwRecommendedSearchPath]); - ofn.lStructSize = sizeof(ofn); - ofn.hwndOwner = m_hWnd; - ofn.lpstrFile = wzFile; - ofn.nMaxFile = countof(wzFile); - ofn.lpstrFilter = L"All Files\0*.*\0"; - ofn.nFilterIndex = 1; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; - ofn.lpstrTitle = m_pTheme->sczCaption; + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = m_hWnd; + ofn.lpstrFile = wzFile; + ofn.nMaxFile = countof(wzFile); + ofn.lpstrFilter = L"All Files\0*.*\0"; + ofn.nFilterIndex = 1; + ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; + ofn.lpstrTitle = m_pTheme->sczCaption; - if (::GetOpenFileNameW(&ofn)) - { - hr = m_pEngine->SetLocalSource(wzPackageOrContainerId, wzPayloadId, ofn.lpstrFile); - *pAction = BOOTSTRAPPER_RESOLVESOURCE_ACTION_RETRY; - } - else - { - *pfCancel = TRUE; - } + if (::GetOpenFileNameW(&ofn)) + { + hr = m_pEngine->SetLocalSource(wzPackageOrContainerId, wzPayloadId, ofn.lpstrFile); + *pAction = BOOTSTRAPPER_CACHE_RESOLVE_RETRY; + } + else + { + *pfCancel = TRUE; } - } - else if (wzDownloadSource) - { - // If doing a non-interactive install and download source is available, let's try downloading the package silently - *pAction = BOOTSTRAPPER_RESOLVESOURCE_ACTION_DOWNLOAD; } // else there's nothing more we can do in non-interactive mode @@ -1196,8 +1189,8 @@ public: // IBootstrapperApplication case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIREPROGRESS: OnCacheAcquireProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONRESOLVESOURCE: - OnResolveSourceFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIRERESOLVING: + OnCacheAcquireResolvingFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIRECOMPLETE: OnCacheAcquireCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); @@ -1570,12 +1563,12 @@ private: // privates m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIREPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); } - void OnResolveSourceFallback( - __in BA_ONRESOLVESOURCE_ARGS* pArgs, - __inout BA_ONRESOLVESOURCE_RESULTS* pResults + void OnCacheAcquireResolvingFallback( + __in BA_ONCACHEACQUIRERESOLVING_ARGS* pArgs, + __inout BA_ONCACHEACQUIRERESOLVING_RESULTS* pResults ) { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONRESOLVESOURCE, pArgs, pResults, m_pvBAFunctionsProcContext); + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIRERESOLVING, pArgs, pResults, m_pvBAFunctionsProcContext); } void OnCacheAcquireCompleteFallback( diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index cf236703..ebb9d908 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index e484da0c..6d7d61a2 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,8 +5,8 @@ - - + + @@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From 5bbff3ae92decfd071f835b5d489e63000f8cf19 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 19 Apr 2021 19:41:23 -0500 Subject: Process new cache BA messages. --- .../WixStandardBootstrapperApplication.cpp | 159 +++++++++++++++++++++ 1 file changed, 159 insertions(+) (limited to 'src') diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 23fded79..2a8edb93 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -628,6 +628,64 @@ public: // IBootstrapperApplication } + virtual STDMETHODIMP OnCacheContainerOrPayloadVerifyProgress( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in DWORD64 dw64Progress, + __in DWORD64 dw64Total, + __in DWORD dwOverallPercentage, + __inout BOOL* pfCancel + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCacheContainerOrPayloadVerifyProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage); +#endif + + UpdateCacheProgress(dwOverallPercentage); + + return __super::OnCacheContainerOrPayloadVerifyProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnCachePayloadExtractProgress( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in DWORD64 dw64Progress, + __in DWORD64 dw64Total, + __in DWORD dwOverallPercentage, + __inout BOOL* pfCancel + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCachePayloadExtractProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage); +#endif + + UpdateCacheProgress(dwOverallPercentage); + + return __super::OnCachePayloadExtractProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnCacheVerifyProgress( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in DWORD64 dw64Progress, + __in DWORD64 dw64Total, + __in DWORD dwOverallPercentage, + __in BOOTSTRAPPER_CACHE_VERIFY_STEP verifyStep, + __inout BOOL* pfCancel + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCacheVerifyProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%, step: %u", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, verifyStep); +#endif + + UpdateCacheProgress(dwOverallPercentage); + + return __super::OnCacheVerifyProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, verifyStep, pfCancel); + } + + virtual STDMETHODIMP OnCacheAcquireComplete( __in_z LPCWSTR wzPackageOrContainerId, __in_z_opt LPCWSTR wzPayloadId, @@ -641,6 +699,28 @@ public: // IBootstrapperApplication } + virtual STDMETHODIMP OnCacheContainerOrPayloadVerifyComplete( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in HRESULT hrStatus + ) + { + SetProgressState(hrStatus); + return __super::OnCacheContainerOrPayloadVerifyComplete(wzPackageOrContainerId, wzPayloadId, hrStatus); + } + + + virtual STDMETHODIMP OnCachePayloadExtractComplete( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in HRESULT hrStatus + ) + { + SetProgressState(hrStatus); + return __super::OnCachePayloadExtractComplete(wzPackageOrContainerId, wzPayloadId, hrStatus); + } + + virtual STDMETHODIMP OnCacheVerifyComplete( __in_z LPCWSTR wzPackageId, __in_z LPCWSTR wzPayloadId, @@ -1282,8 +1362,31 @@ public: // IBootstrapperApplication case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDPACKAGE: OnPlannedPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEVERIFYPROGRESS: + OnCacheVerifyProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYBEGIN: + OnCacheContainerOrPayloadVerifyBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE: + OnCacheContainerOrPayloadVerifyCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS: + OnCacheContainerOrPayloadVerifyProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTBEGIN: + OnCachePayloadExtractBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTCOMPLETE: + OnCachePayloadExtractCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTPROGRESS: + OnCachePayloadExtractProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; default: +#ifdef DEBUG BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message); +#endif m_pfnBAFunctionsProc((BA_FUNCTIONS_MESSAGE)message, pvArgs, pvResults, m_pvBAFunctionsProcContext); break; } @@ -1817,6 +1920,62 @@ private: // privates BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleId, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable"); } + void OnCacheVerifyProgressFallback( + __in BA_ONCACHEVERIFYPROGRESS_ARGS* pArgs, + __inout BA_ONCACHEVERIFYPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEVERIFYPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheContainerOrPayloadVerifyBeginFallback( + __in BA_ONCACHECONTAINERORPAYLOADVERIFYBEGIN_ARGS* pArgs, + __inout BA_ONCACHECONTAINERORPAYLOADVERIFYBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheContainerOrPayloadVerifyCompleteFallback( + __in BA_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE_ARGS* pArgs, + __inout BA_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheContainerOrPayloadVerifyProgressFallback( + __in BA_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS_ARGS* pArgs, + __inout BA_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePayloadExtractBeginFallback( + __in BA_ONCACHEPAYLOADEXTRACTBEGIN_ARGS* pArgs, + __inout BA_ONCACHEPAYLOADEXTRACTBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPAYLOADEXTRACTBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePayloadExtractCompleteFallback( + __in BA_ONCACHEPAYLOADEXTRACTCOMPLETE_ARGS* pArgs, + __inout BA_ONCACHEPAYLOADEXTRACTCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPAYLOADEXTRACTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePayloadExtractProgressFallback( + __in BA_ONCACHEPAYLOADEXTRACTPROGRESS_ARGS* pArgs, + __inout BA_ONCACHEPAYLOADEXTRACTPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPAYLOADEXTRACTPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + // // UiThreadProc - entrypoint for UI thread. // -- cgit v1.2.3-55-g6feb From 47e586580ac36d37d14aa6afd07dbd820d24a64b Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Mon, 19 Apr 2021 23:57:24 -0500 Subject: Use IReadOnlyCollection. --- global.json | 2 +- src/wixext/BalBurnBackendExtension.cs | 2 +- src/wixext/BalExtensionFactory.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index e30536fb..5543c0a8 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0209" + "WixToolset.Sdk": "4.0.0-build-0210" }, "sdk": { "allowPrerelease": false diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs index 6e639c1b..e8dc7a3e 100644 --- a/src/wixext/BalBurnBackendExtension.cs +++ b/src/wixext/BalBurnBackendExtension.cs @@ -25,7 +25,7 @@ namespace WixToolset.Bal BalSymbolDefinitions.WixStdbaOverridableVariable, }; - protected override IEnumerable SymbolDefinitions => BurnSymbolDefinitions; + protected override IReadOnlyCollection SymbolDefinitions => BurnSymbolDefinitions; public override void SymbolsFinalized(IntermediateSection section) { diff --git a/src/wixext/BalExtensionFactory.cs b/src/wixext/BalExtensionFactory.cs index 30ec88c3..0bfb6c5f 100644 --- a/src/wixext/BalExtensionFactory.cs +++ b/src/wixext/BalExtensionFactory.cs @@ -8,7 +8,7 @@ namespace WixToolset.Bal public class BalExtensionFactory : BaseExtensionFactory { - protected override IEnumerable ExtensionTypes => new[] + protected override IReadOnlyCollection ExtensionTypes => new[] { typeof(BalCompiler), typeof(BalExtensionData), -- cgit v1.2.3-55-g6feb From 14987a72cc1a3493ca8f80693d273352fc314bd9 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 28 Apr 2021 19:33:49 -0500 Subject: Update dependencies. --- global.json | 2 +- src/Samples/bafunctions/bafunctions.vcxproj | 12 +++++------ src/Samples/bafunctions/packages.config | 6 +++--- src/dnchost/dnchost.vcxproj | 12 +++++------ src/dnchost/packages.config | 6 +++--- src/mbahost/mbahost.vcxproj | 12 +++++------ src/mbahost/packages.config | 6 +++--- .../examples/TestEngine/Example.TestEngine.vcxproj | 12 +++++------ src/test/examples/TestEngine/packages.config | 6 +++--- .../WixStandardBootstrapperApplication.cpp | 25 +++++++++++++++------- src/wixstdba/packages.config | 6 +++--- src/wixstdba/wixstdba.vcxproj | 12 +++++------ 12 files changed, 63 insertions(+), 54 deletions(-) (limited to 'src') diff --git a/global.json b/global.json index bd2257b6..697f5687 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0212" + "WixToolset.Sdk": "4.0.0-build-0213" }, "sdk": { "allowPrerelease": false diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj index 69914bab..640c812d 100644 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ b/src/Samples/bafunctions/bafunctions.vcxproj @@ -2,9 +2,9 @@ - - - + + + @@ -73,9 +73,9 @@ 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}. - - - + + + diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config index be5b9f7f..548ddb48 100644 --- a/src/Samples/bafunctions/packages.config +++ b/src/Samples/bafunctions/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj index 51a12d8d..bef3f77e 100644 --- a/src/dnchost/dnchost.vcxproj +++ b/src/dnchost/dnchost.vcxproj @@ -4,9 +4,9 @@ - - - + + + Debug @@ -99,8 +99,8 @@ - - - + + + \ No newline at end of file diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config index 3767d555..6c369364 100644 --- a/src/dnchost/packages.config +++ b/src/dnchost/packages.config @@ -7,7 +7,7 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj index b016159c..6457b4e0 100644 --- a/src/mbahost/mbahost.vcxproj +++ b/src/mbahost/mbahost.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -99,8 +99,8 @@ - - - + + + \ No newline at end of file diff --git a/src/mbahost/packages.config b/src/mbahost/packages.config index ebb9d908..071284ac 100644 --- a/src/mbahost/packages.config +++ b/src/mbahost/packages.config @@ -4,7 +4,7 @@ - - - + + + \ 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 e93cacac..99eb917e 100644 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ b/src/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -1,9 +1,9 @@ - - - + + + Debug @@ -76,8 +76,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/packages.config b/src/test/examples/TestEngine/packages.config index be5b9f7f..548ddb48 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/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp index 2a8edb93..d4bf7b43 100644 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ b/src/wixstdba/WixStandardBootstrapperApplication.cpp @@ -389,9 +389,12 @@ public: // IBootstrapperApplication virtual STDMETHODIMP OnPlanPackageBegin( __in_z LPCWSTR wzPackageId, __in BOOTSTRAPPER_PACKAGE_STATE state, - __in BOOL fInstallCondition, + __in BOOL fCached, + __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, __in BOOTSTRAPPER_REQUEST_STATE recommendedState, - __inout BOOTSTRAPPER_REQUEST_STATE *pRequestState, + __in BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, + __inout BOOTSTRAPPER_REQUEST_STATE* pRequestState, + __inout BOOTSTRAPPER_CACHE_TYPE* pRequestedCacheType, __inout BOOL* pfCancel ) { @@ -408,7 +411,7 @@ public: // IBootstrapperApplication hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); if (SUCCEEDED(hr) && pPackage->fPrereqPackage && pPackageInfo) { - pPackageInfo->fPlannedToBeInstalled = fInstall = fInstallCondition; + pPackageInfo->fPlannedToBeInstalled = fInstall = BOOTSTRAPPER_PACKAGE_CONDITION_FALSE != installCondition; } if (fInstall) @@ -419,6 +422,12 @@ public: // IBootstrapperApplication { *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE; } + + // Don't force cache packages while installing prerequisites. + if (BOOTSTRAPPER_CACHE_TYPE_FORCE == *pRequestedCacheType) + { + *pRequestedCacheType = BOOTSTRAPPER_CACHE_TYPE_KEEP; + } } else if (m_sczAfterForcedRestartPackage) // after force restart, skip packages until after the package that caused the restart. { @@ -442,7 +451,7 @@ public: // IBootstrapperApplication } } - return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fInstallCondition, recommendedState, pRequestState, pfCancel); + return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel); } @@ -2247,7 +2256,7 @@ private: // privates LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl"; // Find and load .wxl file. - hr = LocProbeForFileEx(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath, TRUE); + hr = LocProbeForFile(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath); BalExitOnFailure(hr, "Failed to probe for loc file: %ls in path: %ls", wzLocFileName, wzModulePath); hr = LocLoadFromFile(sczLocPath, &m_pWixLoc); @@ -2294,7 +2303,7 @@ private: // privates LPWSTR sczThemePath = NULL; LPCWSTR wzThemeFileName = m_fPrereq ? L"mbapreq.thm" : L"thm.xml"; - hr = LocProbeForFileEx(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath, TRUE); + hr = LocProbeForFile(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath); BalExitOnFailure(hr, "Failed to probe for theme file: %ls in path: %ls", wzThemeFileName, wzModulePath); hr = ThemeLoadFromFile(sczThemePath, &m_pTheme); @@ -2960,7 +2969,7 @@ private: // privates hr = StrAllocString(&sczLicenseFilename, PathFile(sczLicenseFormatted), 0); if (SUCCEEDED(hr)) { - hr = LocProbeForFileEx(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath, TRUE); + hr = LocProbeForFile(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath); if (SUCCEEDED(hr)) { hr = ThemeLoadRichEditFromFile(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT, sczLicensePath, m_hModule); @@ -3477,7 +3486,7 @@ private: // privates hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); if (SUCCEEDED(hr)) { - hr = LocProbeForFileEx(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath, TRUE); + hr = LocProbeForFile(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath); } } } diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config index ebb9d908..071284ac 100644 --- a/src/wixstdba/packages.config +++ b/src/wixstdba/packages.config @@ -4,7 +4,7 @@ - - - + + + \ No newline at end of file diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj index 6d7d61a2..06b1c8d8 100644 --- a/src/wixstdba/wixstdba.vcxproj +++ b/src/wixstdba/wixstdba.vcxproj @@ -5,9 +5,9 @@ - - - + + + @@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - - - + + + \ No newline at end of file -- cgit v1.2.3-55-g6feb From ba7bab476501c16e437b0aee71c1be02c3dda176 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Mon, 3 May 2021 15:55:48 -0700 Subject: Move Bal.wixext into ext --- .editorconfig | 37 - Bal.wixext.sln | 319 -- README.md | 2 - appveyor.cmd | 17 - appveyor.yml | 40 - global.json | 8 - nuget.config | 19 - src/.editorconfig | 37 + src/CSharp.Build.props | 13 - src/Cpp.Build.props | 94 - src/Custom.Build.props | 11 - src/CustomizedNativeRecommendedRules.ruleset | 8 - src/Directory.Build.props | 29 - src/Directory.Build.targets | 56 - src/Samples/bafunctions/Readme.txt | 85 - src/Samples/bafunctions/WixSampleBAFunctions.cpp | 95 - src/Samples/bafunctions/bafunctions.cpp | 46 - src/Samples/bafunctions/bafunctions.def | 6 - src/Samples/bafunctions/bafunctions.vcxproj | 81 - src/Samples/bafunctions/packages.config | 7 - src/Samples/bafunctions/precomp.h | 52 - src/Samples/bafunctions/resource.h | 15 - .../BootstrapperApplicationFactory.cs | 89 - .../DnchostAssemblyLoadContext.cs | 58 - src/WixToolset.Dnc.Host/Exceptions.cs | 145 - .../IBootstrapperApplicationFactory.cs | 16 - src/WixToolset.Dnc.Host/NativeMethods.cs | 18 - src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 44 - .../BootstrapperApplicationFactory.cs | 86 - .../BootstrapperSectionGroup.cs | 29 - src/WixToolset.Mba.Host/Exceptions.cs | 145 - src/WixToolset.Mba.Host/HostSection.cs | 47 - src/WixToolset.Mba.Host/NativeMethods.cs | 18 - .../SupportedFrameworkElement.cs | 47 - .../SupportedFrameworkElementCollection.cs | 36 - src/WixToolset.Mba.Host/WixToolset.Mba.Host.config | 26 - src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 54 - src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | 23 - src/dnchost/coreclrhost.h | 137 - src/dnchost/dnchost.cpp | 309 -- src/dnchost/dnchost.def | 6 - src/dnchost/dnchost.h | 35 - src/dnchost/dnchost.vcxproj | 106 - src/dnchost/dncutil.cpp | 411 -- src/dnchost/dncutil.h | 38 - src/dnchost/packages.config | 13 - src/dnchost/precomp.cpp | 3 - src/dnchost/precomp.h | 31 - src/ext/Bal/Bal.wixext.sln | 319 ++ src/ext/Bal/CSharp.Build.props | 13 + src/ext/Bal/Cpp.Build.props | 94 + src/ext/Bal/Custom.Build.props | 11 + .../Bal/CustomizedNativeRecommendedRules.ruleset | 8 + src/ext/Bal/Directory.Build.props | 29 + src/ext/Bal/Directory.Build.targets | 56 + src/ext/Bal/README.md | 2 + src/ext/Bal/Samples/bafunctions/Readme.txt | 85 + .../Samples/bafunctions/WixSampleBAFunctions.cpp | 95 + src/ext/Bal/Samples/bafunctions/bafunctions.cpp | 46 + src/ext/Bal/Samples/bafunctions/bafunctions.def | 6 + .../Bal/Samples/bafunctions/bafunctions.vcxproj | 81 + src/ext/Bal/Samples/bafunctions/packages.config | 7 + src/ext/Bal/Samples/bafunctions/precomp.h | 52 + src/ext/Bal/Samples/bafunctions/resource.h | 15 + .../BootstrapperApplicationFactory.cs | 89 + .../DnchostAssemblyLoadContext.cs | 58 + src/ext/Bal/WixToolset.Dnc.Host/Exceptions.cs | 145 + .../IBootstrapperApplicationFactory.cs | 16 + src/ext/Bal/WixToolset.Dnc.Host/NativeMethods.cs | 18 + .../WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj | 44 + .../BootstrapperApplicationFactory.cs | 86 + .../BootstrapperSectionGroup.cs | 29 + src/ext/Bal/WixToolset.Mba.Host/Exceptions.cs | 145 + src/ext/Bal/WixToolset.Mba.Host/HostSection.cs | 47 + src/ext/Bal/WixToolset.Mba.Host/NativeMethods.cs | 18 + .../SupportedFrameworkElement.cs | 47 + .../SupportedFrameworkElementCollection.cs | 36 + .../WixToolset.Mba.Host/WixToolset.Mba.Host.config | 26 + .../WixToolset.Mba.Host/WixToolset.Mba.Host.csproj | 54 + .../WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec | 23 + src/ext/Bal/appveyor.cmd | 17 + src/ext/Bal/appveyor.yml | 40 + src/ext/Bal/dnchost/coreclrhost.h | 137 + src/ext/Bal/dnchost/dnchost.cpp | 309 ++ src/ext/Bal/dnchost/dnchost.def | 6 + src/ext/Bal/dnchost/dnchost.h | 35 + src/ext/Bal/dnchost/dnchost.vcxproj | 106 + src/ext/Bal/dnchost/dncutil.cpp | 411 ++ src/ext/Bal/dnchost/dncutil.h | 38 + src/ext/Bal/dnchost/packages.config | 13 + src/ext/Bal/dnchost/precomp.cpp | 3 + src/ext/Bal/dnchost/precomp.h | 31 + src/ext/Bal/mbahost/mbahost.cpp | 649 +++ src/ext/Bal/mbahost/mbahost.def | 6 + src/ext/Bal/mbahost/mbahost.vcxproj | 106 + src/ext/Bal/mbahost/packages.config | 10 + src/ext/Bal/mbahost/precomp.cpp | 3 + src/ext/Bal/mbahost/precomp.h | 25 + src/ext/Bal/nuget.config | 19 + .../test/WixToolsetTest.Bal/BalExtensionFixture.cs | 133 + .../WixToolsetTest.Bal/TestData/MBA/Bundle.wxs | 12 + .../TestData/Overridable/Bundle.wxs | 13 + .../TestData/WixStdBa/Bundle.wxs | 12 + .../TestData/WixStdBa/Data/test.msi | Bin 0 -> 32768 bytes .../WixStdBa/DisplayInternalUIConditionBundle.wxs | 12 + .../WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 43 + .../WixToolsetTest.Bal.v3.ncrunchproject | 5 + .../WixToolsetTest.ManagedHost/DncHostFixture.cs | 209 + .../WixToolsetTest.ManagedHost/MbaHostFixture.cs | 94 + .../Bal/test/WixToolsetTest.ManagedHost/README.md | 5 + .../test/WixToolsetTest.ManagedHost/TestEngine.cs | 74 + .../WixToolsetTest.ManagedHost/TestEngineResult.cs | 12 + .../WixToolsetTest.ManagedHost.csproj | 25 + src/ext/Bal/test/examples/Directory.Build.props | 6 + src/ext/Bal/test/examples/Directory.Build.targets | 6 + .../EarliestCoreBundleFDD.wixproj | 2 + .../FrameworkDependentBundle.wxs | 16 + .../EarliestCoreBundleSCD.wixproj | 10 + .../EarliestCoreBundleSCD/SelfContainedBundle.wxs | 11 + .../test/examples/EarliestCoreBundleSCD/ba.xslt | 20 + .../EarliestCoreBundleTrimmedSCD.wixproj | 10 + .../TrimmedSelfContainedBundle.wxs | 11 + .../examples/EarliestCoreBundleTrimmedSCD/ba.xslt | 20 + .../examples/EarliestCoreMBA/EarliestCoreBA.cs | 34 + .../EarliestCoreMBA/EarliestCoreBAFactory.cs | 22 + .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 18 + .../test/examples/FullFramework2Bundle/Bundle.wxs | 14 + .../FullFramework2Bundle.wixproj | 2 + .../Example.FullFramework2MBA.csproj | 20 + .../examples/FullFramework2MBA/FullFramework2BA.cs | 34 + .../FullFramework2MBA/FullFramework2BAFactory.cs | 22 + .../FullFramework2MBA/WixToolset.Mba.Host.config | 20 + .../test/examples/FullFramework4Bundle/Bundle.wxs | 14 + .../FullFramework4Bundle.wixproj | 2 + .../Example.FullFramework4MBA.csproj | 19 + .../examples/FullFramework4MBA/FullFramework4BA.cs | 34 + .../FullFramework4MBA/FullFramework4BAFactory.cs | 22 + .../FullFramework4MBA/WixToolset.Mba.Host.config | 17 + .../FrameworkDependentBundle.wxs | 16 + .../LatestCoreBundleFDD.wixproj | 2 + .../LatestCoreBundleSCD.wixproj | 10 + .../LatestCoreBundleSCD/SelfContainedBundle.wxs | 11 + .../Bal/test/examples/LatestCoreBundleSCD/ba.xslt | 20 + .../LatestCoreBundleTrimmedSCD.wixproj | 10 + .../TrimmedSelfContainedBundle.wxs | 11 + .../examples/LatestCoreBundleTrimmedSCD/ba.xslt | 20 + .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 21 + .../test/examples/LatestCoreMBA/LatestCoreBA.cs | 33 + .../examples/LatestCoreMBA/LatestCoreBAFactory.cs | 22 + .../examples/TestEngine/Example.TestEngine.vcxproj | 83 + .../test/examples/TestEngine/ExampleTestEngine.cpp | 53 + .../Bal/test/examples/TestEngine/ReloadEngine.cpp | 55 + .../Bal/test/examples/TestEngine/ReloadEngine.h | 8 + .../test/examples/TestEngine/ShutdownEngine.cpp | 38 + .../Bal/test/examples/TestEngine/ShutdownEngine.h | 8 + .../Bal/test/examples/TestEngine/TestEngine.cpp | 256 ++ src/ext/Bal/test/examples/TestEngine/TestEngine.h | 80 + .../test/examples/TestEngine/WaitForQuitEngine.cpp | 35 + .../test/examples/TestEngine/WaitForQuitEngine.h | 8 + .../Bal/test/examples/TestEngine/packages.config | 7 + src/ext/Bal/test/examples/TestEngine/precomp.cpp | 3 + src/ext/Bal/test/examples/TestEngine/precomp.h | 20 + .../WPFCoreBundleFDD/FrameworkDependentBundle.wxs | 16 + .../WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj | 2 + .../Bal/test/examples/WPFCoreMBA/AssemblyInfo.cs | 12 + .../examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 16 + .../Bal/test/examples/WPFCoreMBA/MainWindow.xaml | 16 + .../test/examples/WPFCoreMBA/MainWindow.xaml.cs | 17 + src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs | 42 + .../test/examples/WPFCoreMBA/WPFCoreBAFactory.cs | 22 + src/ext/Bal/test/examples/Wix.Build.props | 10 + src/ext/Bal/test/examples/Wix.Build.targets | 8 + src/ext/Bal/test/examples/examples.proj | 50 + src/ext/Bal/wix.snk | Bin 0 -> 596 bytes src/ext/Bal/wixext/BalBurnBackendExtension.cs | 171 + src/ext/Bal/wixext/BalCompiler.cs | 923 +++++ src/ext/Bal/wixext/BalErrors.cs | 61 + src/ext/Bal/wixext/BalExtensionData.cs | 30 + src/ext/Bal/wixext/BalExtensionFactory.cs | 18 + src/ext/Bal/wixext/BalWarnings.cs | 31 + src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs | 80 + .../Symbols/WixBalBAFactoryAssemblySymbol.cs | 55 + .../Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs | 47 + .../Bal/wixext/Symbols/WixBalConditionSymbol.cs | 55 + .../Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs | 55 + src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs | 47 + .../Symbols/WixMbaPrereqInformationSymbol.cs | 63 + .../Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs | 79 + .../Symbols/WixStdbaOverridableVariableSymbol.cs | 47 + src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj | 39 + src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec | 26 + src/ext/Bal/wixext/WixToolset.Bal.wixext.targets | 11 + src/ext/Bal/wixlib/BalExtension_arm64.wxs | 7 + src/ext/Bal/wixlib/BalExtension_platform.wxi | 69 + src/ext/Bal/wixlib/BalExtension_x64.wxs | 7 + src/ext/Bal/wixlib/BalExtension_x86.wxs | 7 + src/ext/Bal/wixlib/Dnc.wxs | 20 + src/ext/Bal/wixlib/Mba.wxs | 43 + src/ext/Bal/wixlib/bal.wixproj | 36 + src/ext/Bal/wixlib/caDecor.wxi | 39 + src/ext/Bal/wixlib/wixstdba.wxs | 92 + src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl | 27 + src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl | 33 + src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl | 32 + src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl | 31 + src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl | 27 + src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl | 27 + src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl | 29 + src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl | 29 + src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl | 30 + src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl | 27 + src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl | 29 + src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl | 31 + .../Bal/wixstdba/Resources/HyperlinkLargeTheme.xml | 109 + .../wixstdba/Resources/HyperlinkSidebarTheme.xml | 120 + src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl | 61 + src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml | 106 + .../Bal/wixstdba/Resources/LoremIpsumLicense.rtf | Bin 0 -> 4908 bytes src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml | 108 + src/ext/Bal/wixstdba/Resources/RtfTheme.wxl | 58 + src/ext/Bal/wixstdba/Resources/RtfTheme.xml | 106 + src/ext/Bal/wixstdba/Resources/dncpreq.thm | 47 + src/ext/Bal/wixstdba/Resources/dncpreq.wxl | 29 + src/ext/Bal/wixstdba/Resources/logo.png | Bin 0 -> 852 bytes src/ext/Bal/wixstdba/Resources/logoSide.png | Bin 0 -> 3477 bytes src/ext/Bal/wixstdba/Resources/mbapreq.png | Bin 0 -> 797 bytes src/ext/Bal/wixstdba/Resources/mbapreq.thm | 47 + src/ext/Bal/wixstdba/Resources/mbapreq.wxl | 29 + .../WixStandardBootstrapperApplication.cpp | 4264 ++++++++++++++++++++ src/ext/Bal/wixstdba/packages.config | 10 + src/ext/Bal/wixstdba/precomp.cpp | 3 + src/ext/Bal/wixstdba/precomp.h | 58 + src/ext/Bal/wixstdba/resource.h | 15 + src/ext/Bal/wixstdba/wixstdba.cpp | 144 + src/ext/Bal/wixstdba/wixstdba.def | 10 + src/ext/Bal/wixstdba/wixstdba.mc | 73 + src/ext/Bal/wixstdba/wixstdba.vcxproj | 101 + src/ext/global.json | 8 + src/mbahost/mbahost.cpp | 649 --- src/mbahost/mbahost.def | 6 - src/mbahost/mbahost.vcxproj | 106 - src/mbahost/packages.config | 10 - src/mbahost/precomp.cpp | 3 - src/mbahost/precomp.h | 25 - src/test/WixToolsetTest.Bal/BalExtensionFixture.cs | 133 - .../WixToolsetTest.Bal/TestData/MBA/Bundle.wxs | 12 - .../TestData/Overridable/Bundle.wxs | 13 - .../TestData/WixStdBa/Bundle.wxs | 12 - .../TestData/WixStdBa/Data/test.msi | Bin 32768 -> 0 bytes .../WixStdBa/DisplayInternalUIConditionBundle.wxs | 12 - .../WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 43 - .../WixToolsetTest.Bal.v3.ncrunchproject | 5 - .../WixToolsetTest.ManagedHost/DncHostFixture.cs | 209 - .../WixToolsetTest.ManagedHost/MbaHostFixture.cs | 94 - src/test/WixToolsetTest.ManagedHost/README.md | 5 - src/test/WixToolsetTest.ManagedHost/TestEngine.cs | 74 - .../WixToolsetTest.ManagedHost/TestEngineResult.cs | 12 - .../WixToolsetTest.ManagedHost.csproj | 25 - src/test/examples/Directory.Build.props | 6 - src/test/examples/Directory.Build.targets | 6 - .../EarliestCoreBundleFDD.wixproj | 2 - .../FrameworkDependentBundle.wxs | 16 - .../EarliestCoreBundleSCD.wixproj | 10 - .../EarliestCoreBundleSCD/SelfContainedBundle.wxs | 11 - src/test/examples/EarliestCoreBundleSCD/ba.xslt | 20 - .../EarliestCoreBundleTrimmedSCD.wixproj | 10 - .../TrimmedSelfContainedBundle.wxs | 11 - .../examples/EarliestCoreBundleTrimmedSCD/ba.xslt | 20 - .../examples/EarliestCoreMBA/EarliestCoreBA.cs | 34 - .../EarliestCoreMBA/EarliestCoreBAFactory.cs | 22 - .../EarliestCoreMBA/Example.EarliestCoreMBA.csproj | 18 - src/test/examples/FullFramework2Bundle/Bundle.wxs | 14 - .../FullFramework2Bundle.wixproj | 2 - .../Example.FullFramework2MBA.csproj | 20 - .../examples/FullFramework2MBA/FullFramework2BA.cs | 34 - .../FullFramework2MBA/FullFramework2BAFactory.cs | 22 - .../FullFramework2MBA/WixToolset.Mba.Host.config | 20 - src/test/examples/FullFramework4Bundle/Bundle.wxs | 14 - .../FullFramework4Bundle.wixproj | 2 - .../Example.FullFramework4MBA.csproj | 19 - .../examples/FullFramework4MBA/FullFramework4BA.cs | 34 - .../FullFramework4MBA/FullFramework4BAFactory.cs | 22 - .../FullFramework4MBA/WixToolset.Mba.Host.config | 17 - .../FrameworkDependentBundle.wxs | 16 - .../LatestCoreBundleFDD.wixproj | 2 - .../LatestCoreBundleSCD.wixproj | 10 - .../LatestCoreBundleSCD/SelfContainedBundle.wxs | 11 - src/test/examples/LatestCoreBundleSCD/ba.xslt | 20 - .../LatestCoreBundleTrimmedSCD.wixproj | 10 - .../TrimmedSelfContainedBundle.wxs | 11 - .../examples/LatestCoreBundleTrimmedSCD/ba.xslt | 20 - .../LatestCoreMBA/Example.LatestCoreMBA.csproj | 21 - src/test/examples/LatestCoreMBA/LatestCoreBA.cs | 33 - .../examples/LatestCoreMBA/LatestCoreBAFactory.cs | 22 - .../examples/TestEngine/Example.TestEngine.vcxproj | 83 - src/test/examples/TestEngine/ExampleTestEngine.cpp | 53 - src/test/examples/TestEngine/ReloadEngine.cpp | 55 - src/test/examples/TestEngine/ReloadEngine.h | 8 - src/test/examples/TestEngine/ShutdownEngine.cpp | 38 - src/test/examples/TestEngine/ShutdownEngine.h | 8 - src/test/examples/TestEngine/TestEngine.cpp | 256 -- src/test/examples/TestEngine/TestEngine.h | 80 - src/test/examples/TestEngine/WaitForQuitEngine.cpp | 35 - src/test/examples/TestEngine/WaitForQuitEngine.h | 8 - src/test/examples/TestEngine/packages.config | 7 - src/test/examples/TestEngine/precomp.cpp | 3 - src/test/examples/TestEngine/precomp.h | 20 - .../WPFCoreBundleFDD/FrameworkDependentBundle.wxs | 16 - .../WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj | 2 - src/test/examples/WPFCoreMBA/AssemblyInfo.cs | 12 - .../examples/WPFCoreMBA/Example.WPFCoreMBA.csproj | 16 - src/test/examples/WPFCoreMBA/MainWindow.xaml | 16 - src/test/examples/WPFCoreMBA/MainWindow.xaml.cs | 17 - src/test/examples/WPFCoreMBA/WPFCoreBA.cs | 42 - src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs | 22 - src/test/examples/Wix.Build.props | 10 - src/test/examples/Wix.Build.targets | 8 - src/test/examples/examples.proj | 50 - src/version.json | 11 + src/wix.snk | Bin 596 -> 0 bytes src/wixext/BalBurnBackendExtension.cs | 171 - src/wixext/BalCompiler.cs | 923 ----- src/wixext/BalErrors.cs | 61 - src/wixext/BalExtensionData.cs | 30 - src/wixext/BalExtensionFactory.cs | 18 - src/wixext/BalWarnings.cs | 31 - src/wixext/Symbols/BalSymbolDefinitions.cs | 80 - .../Symbols/WixBalBAFactoryAssemblySymbol.cs | 55 - src/wixext/Symbols/WixBalBAFunctionsSymbol.cs | 47 - src/wixext/Symbols/WixBalConditionSymbol.cs | 55 - src/wixext/Symbols/WixBalPackageInfoSymbol.cs | 55 - src/wixext/Symbols/WixDncOptionsSymbol.cs | 47 - .../Symbols/WixMbaPrereqInformationSymbol.cs | 63 - src/wixext/Symbols/WixStdbaOptionsSymbol.cs | 79 - .../Symbols/WixStdbaOverridableVariableSymbol.cs | 47 - src/wixext/WixToolset.Bal.wixext.csproj | 39 - src/wixext/WixToolset.Bal.wixext.nuspec | 26 - src/wixext/WixToolset.Bal.wixext.targets | 11 - src/wixlib/BalExtension_arm64.wxs | 7 - src/wixlib/BalExtension_platform.wxi | 69 - src/wixlib/BalExtension_x64.wxs | 7 - src/wixlib/BalExtension_x86.wxs | 7 - src/wixlib/Dnc.wxs | 20 - src/wixlib/Mba.wxs | 43 - src/wixlib/bal.wixproj | 36 - src/wixlib/caDecor.wxi | 39 - src/wixlib/wixstdba.wxs | 92 - src/wixstdba/Resources/1028/mbapreq.wxl | 27 - src/wixstdba/Resources/1029/mbapreq.wxl | 30 - src/wixstdba/Resources/1030/mbapreq.wxl | 30 - src/wixstdba/Resources/1031/mbapreq.wxl | 33 - src/wixstdba/Resources/1032/mbapreq.wxl | 32 - src/wixstdba/Resources/1035/mbapreq.wxl | 30 - src/wixstdba/Resources/1036/mbapreq.wxl | 30 - src/wixstdba/Resources/1038/mbapreq.wxl | 30 - src/wixstdba/Resources/1040/mbapreq.wxl | 31 - src/wixstdba/Resources/1041/mbapreq.wxl | 27 - src/wixstdba/Resources/1042/mbapreq.wxl | 27 - src/wixstdba/Resources/1043/mbapreq.wxl | 30 - src/wixstdba/Resources/1044/mbapreq.wxl | 30 - src/wixstdba/Resources/1045/mbapreq.wxl | 30 - src/wixstdba/Resources/1046/mbapreq.wxl | 29 - src/wixstdba/Resources/1049/mbapreq.wxl | 29 - src/wixstdba/Resources/1051/mbapreq.wxl | 30 - src/wixstdba/Resources/1053/mbapreq.wxl | 30 - src/wixstdba/Resources/1055/mbapreq.wxl | 30 - src/wixstdba/Resources/1060/mbapreq.wxl | 30 - src/wixstdba/Resources/2052/mbapreq.wxl | 27 - src/wixstdba/Resources/2070/mbapreq.wxl | 29 - src/wixstdba/Resources/3082/mbapreq.wxl | 31 - src/wixstdba/Resources/HyperlinkLargeTheme.xml | 109 - src/wixstdba/Resources/HyperlinkSidebarTheme.xml | 120 - src/wixstdba/Resources/HyperlinkTheme.wxl | 61 - src/wixstdba/Resources/HyperlinkTheme.xml | 106 - src/wixstdba/Resources/LoremIpsumLicense.rtf | Bin 4908 -> 0 bytes src/wixstdba/Resources/RtfLargeTheme.xml | 108 - src/wixstdba/Resources/RtfTheme.wxl | 58 - src/wixstdba/Resources/RtfTheme.xml | 106 - src/wixstdba/Resources/dncpreq.thm | 47 - src/wixstdba/Resources/dncpreq.wxl | 29 - src/wixstdba/Resources/logo.png | Bin 852 -> 0 bytes src/wixstdba/Resources/logoSide.png | Bin 3477 -> 0 bytes src/wixstdba/Resources/mbapreq.png | Bin 797 -> 0 bytes src/wixstdba/Resources/mbapreq.thm | 47 - src/wixstdba/Resources/mbapreq.wxl | 29 - .../WixStandardBootstrapperApplication.cpp | 4264 -------------------- src/wixstdba/packages.config | 10 - src/wixstdba/precomp.cpp | 3 - src/wixstdba/precomp.h | 58 - src/wixstdba/resource.h | 15 - src/wixstdba/wixstdba.cpp | 144 - src/wixstdba/wixstdba.def | 10 - src/wixstdba/wixstdba.mc | 73 - src/wixstdba/wixstdba.vcxproj | 101 - version.json | 11 - 406 files changed, 14254 insertions(+), 14254 deletions(-) delete mode 100644 .editorconfig delete mode 100644 Bal.wixext.sln delete mode 100644 README.md delete mode 100644 appveyor.cmd delete mode 100644 appveyor.yml delete mode 100644 global.json delete mode 100644 nuget.config create mode 100644 src/.editorconfig delete mode 100644 src/CSharp.Build.props delete mode 100644 src/Cpp.Build.props delete mode 100644 src/Custom.Build.props delete mode 100644 src/CustomizedNativeRecommendedRules.ruleset delete mode 100644 src/Directory.Build.props delete mode 100644 src/Directory.Build.targets delete mode 100644 src/Samples/bafunctions/Readme.txt delete mode 100644 src/Samples/bafunctions/WixSampleBAFunctions.cpp delete mode 100644 src/Samples/bafunctions/bafunctions.cpp delete mode 100644 src/Samples/bafunctions/bafunctions.def delete mode 100644 src/Samples/bafunctions/bafunctions.vcxproj delete mode 100644 src/Samples/bafunctions/packages.config delete mode 100644 src/Samples/bafunctions/precomp.h delete mode 100644 src/Samples/bafunctions/resource.h delete mode 100644 src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs delete mode 100644 src/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs delete mode 100644 src/WixToolset.Dnc.Host/Exceptions.cs delete mode 100644 src/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs delete mode 100644 src/WixToolset.Dnc.Host/NativeMethods.cs delete mode 100644 src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj delete mode 100644 src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs delete mode 100644 src/WixToolset.Mba.Host/BootstrapperSectionGroup.cs delete mode 100644 src/WixToolset.Mba.Host/Exceptions.cs delete mode 100644 src/WixToolset.Mba.Host/HostSection.cs delete mode 100644 src/WixToolset.Mba.Host/NativeMethods.cs delete mode 100644 src/WixToolset.Mba.Host/SupportedFrameworkElement.cs delete mode 100644 src/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs delete mode 100644 src/WixToolset.Mba.Host/WixToolset.Mba.Host.config delete mode 100644 src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj delete mode 100644 src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec delete mode 100644 src/dnchost/coreclrhost.h delete mode 100644 src/dnchost/dnchost.cpp delete mode 100644 src/dnchost/dnchost.def delete mode 100644 src/dnchost/dnchost.h delete mode 100644 src/dnchost/dnchost.vcxproj delete mode 100644 src/dnchost/dncutil.cpp delete mode 100644 src/dnchost/dncutil.h delete mode 100644 src/dnchost/packages.config delete mode 100644 src/dnchost/precomp.cpp delete mode 100644 src/dnchost/precomp.h create mode 100644 src/ext/Bal/Bal.wixext.sln create mode 100644 src/ext/Bal/CSharp.Build.props create mode 100644 src/ext/Bal/Cpp.Build.props create mode 100644 src/ext/Bal/Custom.Build.props create mode 100644 src/ext/Bal/CustomizedNativeRecommendedRules.ruleset create mode 100644 src/ext/Bal/Directory.Build.props create mode 100644 src/ext/Bal/Directory.Build.targets create mode 100644 src/ext/Bal/README.md create mode 100644 src/ext/Bal/Samples/bafunctions/Readme.txt create mode 100644 src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp create mode 100644 src/ext/Bal/Samples/bafunctions/bafunctions.cpp create mode 100644 src/ext/Bal/Samples/bafunctions/bafunctions.def create mode 100644 src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj create mode 100644 src/ext/Bal/Samples/bafunctions/packages.config create mode 100644 src/ext/Bal/Samples/bafunctions/precomp.h create mode 100644 src/ext/Bal/Samples/bafunctions/resource.h create mode 100644 src/ext/Bal/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs create mode 100644 src/ext/Bal/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs create mode 100644 src/ext/Bal/WixToolset.Dnc.Host/Exceptions.cs create mode 100644 src/ext/Bal/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs create mode 100644 src/ext/Bal/WixToolset.Dnc.Host/NativeMethods.cs create mode 100644 src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj create mode 100644 src/ext/Bal/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs create mode 100644 src/ext/Bal/WixToolset.Mba.Host/BootstrapperSectionGroup.cs create mode 100644 src/ext/Bal/WixToolset.Mba.Host/Exceptions.cs create mode 100644 src/ext/Bal/WixToolset.Mba.Host/HostSection.cs create mode 100644 src/ext/Bal/WixToolset.Mba.Host/NativeMethods.cs create mode 100644 src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElement.cs create mode 100644 src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs create mode 100644 src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config create mode 100644 src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj create mode 100644 src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec create mode 100644 src/ext/Bal/appveyor.cmd create mode 100644 src/ext/Bal/appveyor.yml create mode 100644 src/ext/Bal/dnchost/coreclrhost.h create mode 100644 src/ext/Bal/dnchost/dnchost.cpp create mode 100644 src/ext/Bal/dnchost/dnchost.def create mode 100644 src/ext/Bal/dnchost/dnchost.h create mode 100644 src/ext/Bal/dnchost/dnchost.vcxproj create mode 100644 src/ext/Bal/dnchost/dncutil.cpp create mode 100644 src/ext/Bal/dnchost/dncutil.h create mode 100644 src/ext/Bal/dnchost/packages.config create mode 100644 src/ext/Bal/dnchost/precomp.cpp create mode 100644 src/ext/Bal/dnchost/precomp.h create mode 100644 src/ext/Bal/mbahost/mbahost.cpp create mode 100644 src/ext/Bal/mbahost/mbahost.def create mode 100644 src/ext/Bal/mbahost/mbahost.vcxproj create mode 100644 src/ext/Bal/mbahost/packages.config create mode 100644 src/ext/Bal/mbahost/precomp.cpp create mode 100644 src/ext/Bal/mbahost/precomp.h create mode 100644 src/ext/Bal/nuget.config create mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs create mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi create mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs create mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj create mode 100644 src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject create mode 100644 src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs create mode 100644 src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs create mode 100644 src/ext/Bal/test/WixToolsetTest.ManagedHost/README.md create mode 100644 src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs create mode 100644 src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngineResult.cs create mode 100644 src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj create mode 100644 src/ext/Bal/test/examples/Directory.Build.props create mode 100644 src/ext/Bal/test/examples/Directory.Build.targets create mode 100644 src/ext/Bal/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj create mode 100644 src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs create mode 100644 src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj create mode 100644 src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs create mode 100644 src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt create mode 100644 src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj create mode 100644 src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs create mode 100644 src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt create mode 100644 src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs create mode 100644 src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs create mode 100644 src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj create mode 100644 src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs create mode 100644 src/ext/Bal/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj create mode 100644 src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj create mode 100644 src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs create mode 100644 src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs create mode 100644 src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config create mode 100644 src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs create mode 100644 src/ext/Bal/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj create mode 100644 src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj create mode 100644 src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs create mode 100644 src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs create mode 100644 src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config create mode 100644 src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs create mode 100644 src/ext/Bal/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj create mode 100644 src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj create mode 100644 src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs create mode 100644 src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt create mode 100644 src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj create mode 100644 src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs create mode 100644 src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt create mode 100644 src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj create mode 100644 src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs create mode 100644 src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs create mode 100644 src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj create mode 100644 src/ext/Bal/test/examples/TestEngine/ExampleTestEngine.cpp create mode 100644 src/ext/Bal/test/examples/TestEngine/ReloadEngine.cpp create mode 100644 src/ext/Bal/test/examples/TestEngine/ReloadEngine.h create mode 100644 src/ext/Bal/test/examples/TestEngine/ShutdownEngine.cpp create mode 100644 src/ext/Bal/test/examples/TestEngine/ShutdownEngine.h create mode 100644 src/ext/Bal/test/examples/TestEngine/TestEngine.cpp create mode 100644 src/ext/Bal/test/examples/TestEngine/TestEngine.h create mode 100644 src/ext/Bal/test/examples/TestEngine/WaitForQuitEngine.cpp create mode 100644 src/ext/Bal/test/examples/TestEngine/WaitForQuitEngine.h create mode 100644 src/ext/Bal/test/examples/TestEngine/packages.config create mode 100644 src/ext/Bal/test/examples/TestEngine/precomp.cpp create mode 100644 src/ext/Bal/test/examples/TestEngine/precomp.h create mode 100644 src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs create mode 100644 src/ext/Bal/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj create mode 100644 src/ext/Bal/test/examples/WPFCoreMBA/AssemblyInfo.cs create mode 100644 src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj create mode 100644 src/ext/Bal/test/examples/WPFCoreMBA/MainWindow.xaml create mode 100644 src/ext/Bal/test/examples/WPFCoreMBA/MainWindow.xaml.cs create mode 100644 src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs create mode 100644 src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs create mode 100644 src/ext/Bal/test/examples/Wix.Build.props create mode 100644 src/ext/Bal/test/examples/Wix.Build.targets create mode 100644 src/ext/Bal/test/examples/examples.proj create mode 100644 src/ext/Bal/wix.snk create mode 100644 src/ext/Bal/wixext/BalBurnBackendExtension.cs create mode 100644 src/ext/Bal/wixext/BalCompiler.cs create mode 100644 src/ext/Bal/wixext/BalErrors.cs create mode 100644 src/ext/Bal/wixext/BalExtensionData.cs create mode 100644 src/ext/Bal/wixext/BalExtensionFactory.cs create mode 100644 src/ext/Bal/wixext/BalWarnings.cs create mode 100644 src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs create mode 100644 src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs create mode 100644 src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs create mode 100644 src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs create mode 100644 src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs create mode 100644 src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs create mode 100644 src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs create mode 100644 src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs create mode 100644 src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs create mode 100644 src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj create mode 100644 src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec create mode 100644 src/ext/Bal/wixext/WixToolset.Bal.wixext.targets create mode 100644 src/ext/Bal/wixlib/BalExtension_arm64.wxs create mode 100644 src/ext/Bal/wixlib/BalExtension_platform.wxi create mode 100644 src/ext/Bal/wixlib/BalExtension_x64.wxs create mode 100644 src/ext/Bal/wixlib/BalExtension_x86.wxs create mode 100644 src/ext/Bal/wixlib/Dnc.wxs create mode 100644 src/ext/Bal/wixlib/Mba.wxs create mode 100644 src/ext/Bal/wixlib/bal.wixproj create mode 100644 src/ext/Bal/wixlib/caDecor.wxi create mode 100644 src/ext/Bal/wixlib/wixstdba.wxs create mode 100644 src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml create mode 100644 src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml create mode 100644 src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml create mode 100644 src/ext/Bal/wixstdba/Resources/LoremIpsumLicense.rtf create mode 100644 src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml create mode 100644 src/ext/Bal/wixstdba/Resources/RtfTheme.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/RtfTheme.xml create mode 100644 src/ext/Bal/wixstdba/Resources/dncpreq.thm create mode 100644 src/ext/Bal/wixstdba/Resources/dncpreq.wxl create mode 100644 src/ext/Bal/wixstdba/Resources/logo.png create mode 100644 src/ext/Bal/wixstdba/Resources/logoSide.png create mode 100644 src/ext/Bal/wixstdba/Resources/mbapreq.png create mode 100644 src/ext/Bal/wixstdba/Resources/mbapreq.thm create mode 100644 src/ext/Bal/wixstdba/Resources/mbapreq.wxl create mode 100644 src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp create mode 100644 src/ext/Bal/wixstdba/packages.config create mode 100644 src/ext/Bal/wixstdba/precomp.cpp create mode 100644 src/ext/Bal/wixstdba/precomp.h create mode 100644 src/ext/Bal/wixstdba/resource.h create mode 100644 src/ext/Bal/wixstdba/wixstdba.cpp create mode 100644 src/ext/Bal/wixstdba/wixstdba.def create mode 100644 src/ext/Bal/wixstdba/wixstdba.mc create mode 100644 src/ext/Bal/wixstdba/wixstdba.vcxproj create mode 100644 src/ext/global.json delete mode 100644 src/mbahost/mbahost.cpp delete mode 100644 src/mbahost/mbahost.def delete mode 100644 src/mbahost/mbahost.vcxproj delete mode 100644 src/mbahost/packages.config delete mode 100644 src/mbahost/precomp.cpp delete mode 100644 src/mbahost/precomp.h delete mode 100644 src/test/WixToolsetTest.Bal/BalExtensionFixture.cs delete mode 100644 src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs delete mode 100644 src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs delete mode 100644 src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs delete mode 100644 src/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi delete mode 100644 src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs delete mode 100644 src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj delete mode 100644 src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject delete mode 100644 src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs delete mode 100644 src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs delete mode 100644 src/test/WixToolsetTest.ManagedHost/README.md delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestEngine.cs delete mode 100644 src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs delete mode 100644 src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj delete mode 100644 src/test/examples/Directory.Build.props delete mode 100644 src/test/examples/Directory.Build.targets delete mode 100644 src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj delete mode 100644 src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs delete mode 100644 src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj delete mode 100644 src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs delete mode 100644 src/test/examples/EarliestCoreBundleSCD/ba.xslt delete mode 100644 src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj delete mode 100644 src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs delete mode 100644 src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt delete mode 100644 src/test/examples/EarliestCoreMBA/EarliestCoreBA.cs delete mode 100644 src/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs delete mode 100644 src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj delete mode 100644 src/test/examples/FullFramework2Bundle/Bundle.wxs delete mode 100644 src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj delete mode 100644 src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj delete mode 100644 src/test/examples/FullFramework2MBA/FullFramework2BA.cs delete mode 100644 src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs delete mode 100644 src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config delete mode 100644 src/test/examples/FullFramework4Bundle/Bundle.wxs delete mode 100644 src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj delete mode 100644 src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj delete mode 100644 src/test/examples/FullFramework4MBA/FullFramework4BA.cs delete mode 100644 src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs delete mode 100644 src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config delete mode 100644 src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs delete mode 100644 src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj delete mode 100644 src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj delete mode 100644 src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs delete mode 100644 src/test/examples/LatestCoreBundleSCD/ba.xslt delete mode 100644 src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj delete mode 100644 src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs delete mode 100644 src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt delete mode 100644 src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj delete mode 100644 src/test/examples/LatestCoreMBA/LatestCoreBA.cs delete mode 100644 src/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs delete mode 100644 src/test/examples/TestEngine/Example.TestEngine.vcxproj delete mode 100644 src/test/examples/TestEngine/ExampleTestEngine.cpp delete mode 100644 src/test/examples/TestEngine/ReloadEngine.cpp delete mode 100644 src/test/examples/TestEngine/ReloadEngine.h delete mode 100644 src/test/examples/TestEngine/ShutdownEngine.cpp delete mode 100644 src/test/examples/TestEngine/ShutdownEngine.h delete mode 100644 src/test/examples/TestEngine/TestEngine.cpp delete mode 100644 src/test/examples/TestEngine/TestEngine.h delete mode 100644 src/test/examples/TestEngine/WaitForQuitEngine.cpp delete mode 100644 src/test/examples/TestEngine/WaitForQuitEngine.h delete mode 100644 src/test/examples/TestEngine/packages.config delete mode 100644 src/test/examples/TestEngine/precomp.cpp delete mode 100644 src/test/examples/TestEngine/precomp.h delete mode 100644 src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs delete mode 100644 src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj delete mode 100644 src/test/examples/WPFCoreMBA/AssemblyInfo.cs delete mode 100644 src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj delete mode 100644 src/test/examples/WPFCoreMBA/MainWindow.xaml delete mode 100644 src/test/examples/WPFCoreMBA/MainWindow.xaml.cs delete mode 100644 src/test/examples/WPFCoreMBA/WPFCoreBA.cs delete mode 100644 src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs delete mode 100644 src/test/examples/Wix.Build.props delete mode 100644 src/test/examples/Wix.Build.targets delete mode 100644 src/test/examples/examples.proj create mode 100644 src/version.json delete mode 100644 src/wix.snk delete mode 100644 src/wixext/BalBurnBackendExtension.cs delete mode 100644 src/wixext/BalCompiler.cs delete mode 100644 src/wixext/BalErrors.cs delete mode 100644 src/wixext/BalExtensionData.cs delete mode 100644 src/wixext/BalExtensionFactory.cs delete mode 100644 src/wixext/BalWarnings.cs delete mode 100644 src/wixext/Symbols/BalSymbolDefinitions.cs delete mode 100644 src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs delete mode 100644 src/wixext/Symbols/WixBalBAFunctionsSymbol.cs delete mode 100644 src/wixext/Symbols/WixBalConditionSymbol.cs delete mode 100644 src/wixext/Symbols/WixBalPackageInfoSymbol.cs delete mode 100644 src/wixext/Symbols/WixDncOptionsSymbol.cs delete mode 100644 src/wixext/Symbols/WixMbaPrereqInformationSymbol.cs delete mode 100644 src/wixext/Symbols/WixStdbaOptionsSymbol.cs delete mode 100644 src/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs delete mode 100644 src/wixext/WixToolset.Bal.wixext.csproj delete mode 100644 src/wixext/WixToolset.Bal.wixext.nuspec delete mode 100644 src/wixext/WixToolset.Bal.wixext.targets delete mode 100644 src/wixlib/BalExtension_arm64.wxs delete mode 100644 src/wixlib/BalExtension_platform.wxi delete mode 100644 src/wixlib/BalExtension_x64.wxs delete mode 100644 src/wixlib/BalExtension_x86.wxs delete mode 100644 src/wixlib/Dnc.wxs delete mode 100644 src/wixlib/Mba.wxs delete mode 100644 src/wixlib/bal.wixproj delete mode 100644 src/wixlib/caDecor.wxi delete mode 100644 src/wixlib/wixstdba.wxs delete mode 100644 src/wixstdba/Resources/1028/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1029/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1030/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1031/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1032/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1035/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1036/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1038/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1040/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1041/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1042/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1043/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1044/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1045/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1046/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1049/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1051/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1053/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1055/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/1060/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/2052/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/2070/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/3082/mbapreq.wxl delete mode 100644 src/wixstdba/Resources/HyperlinkLargeTheme.xml delete mode 100644 src/wixstdba/Resources/HyperlinkSidebarTheme.xml delete mode 100644 src/wixstdba/Resources/HyperlinkTheme.wxl delete mode 100644 src/wixstdba/Resources/HyperlinkTheme.xml delete mode 100644 src/wixstdba/Resources/LoremIpsumLicense.rtf delete mode 100644 src/wixstdba/Resources/RtfLargeTheme.xml delete mode 100644 src/wixstdba/Resources/RtfTheme.wxl delete mode 100644 src/wixstdba/Resources/RtfTheme.xml delete mode 100644 src/wixstdba/Resources/dncpreq.thm delete mode 100644 src/wixstdba/Resources/dncpreq.wxl delete mode 100644 src/wixstdba/Resources/logo.png delete mode 100644 src/wixstdba/Resources/logoSide.png delete mode 100644 src/wixstdba/Resources/mbapreq.png delete mode 100644 src/wixstdba/Resources/mbapreq.thm delete mode 100644 src/wixstdba/Resources/mbapreq.wxl delete mode 100644 src/wixstdba/WixStandardBootstrapperApplication.cpp delete mode 100644 src/wixstdba/packages.config delete mode 100644 src/wixstdba/precomp.cpp delete mode 100644 src/wixstdba/precomp.h delete mode 100644 src/wixstdba/resource.h delete mode 100644 src/wixstdba/wixstdba.cpp delete mode 100644 src/wixstdba/wixstdba.def delete mode 100644 src/wixstdba/wixstdba.mc delete mode 100644 src/wixstdba/wixstdba.vcxproj delete mode 100644 version.json (limited to 'src') diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 1d72e683..00000000 --- a/.editorconfig +++ /dev/null @@ -1,37 +0,0 @@ -# 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. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig -# then update all of the repos. - -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 4 -trim_trailing_whitespace = true - -[*.{cs,vb}] -dotnet_sort_system_directives_first = true - -[*.cs] -csharp_indent_case_contents = true : error -csharp_indent_switch_labels = true : error -csharp_new_line_before_open_brace = all -csharp_prefer_braces = true : error -csharp_style_expression_bodied_methods = when_on_single_line : suggestion -csharp_style_expression_bodied_constructors = when_on_single_line : suggestion -csharp_style_expression_bodied_operators = when_on_single_line : suggestion -csharp_style_expression_bodied_properties = when_on_single_line : suggestion -csharp_style_expression_bodied_indexers = when_on_single_line : suggestion -csharp_style_expression_bodied_accessors = when_on_single_line : suggestion -csharp_style_var_elsewhere = true : suggestion -csharp_style_var_for_built_in_types = true : suggestion -csharp_style_var_when_type_is_apparent = true : suggestion -dotnet_style_qualification_for_event = true : error -dotnet_style_qualification_for_field = true : error -dotnet_style_qualification_for_method = true : error -dotnet_style_qualification_for_property = true : error - -[*.targets] -indent_size = 2 diff --git a/Bal.wixext.sln b/Bal.wixext.sln deleted file mode 100644 index 0b4c5afa..00000000 --- a/Bal.wixext.sln +++ /dev/null @@ -1,319 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29503.13 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "src\mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "src\wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}" -EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.Host", "src\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj", "{0D780900-C2FF-4FA2-8CB5-8A19768724C5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "src\test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost", "src\test\WixToolsetTest.ManagedHost\WixToolsetTest.ManagedHost.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "src\test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.EarliestCoreMBA", "src\test\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj", "{1E86D8DF-DABD-4B6E-A812-64CD2040C73A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnchost", "src\dnchost\dnchost.vcxproj", "{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.LatestCoreMBA", "src\test\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj", "{A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.WPFCoreMBA", "src\test\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj", "{8E707BF2-FD72-4649-8727-BA5955D48D40}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|ARM64 = Debug|ARM64 - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|ARM64 = Release|ARM64 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.Build.0 = Debug|Win32 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|ARM64.Build.0 = Debug|ARM64 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x64.ActiveCfg = Debug|x64 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x64.Build.0 = Debug|x64 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.ActiveCfg = Debug|Win32 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.Build.0 = Debug|Win32 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.ActiveCfg = Release|Win32 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.Build.0 = Release|Win32 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|ARM64.ActiveCfg = Release|ARM64 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|ARM64.Build.0 = Release|ARM64 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.ActiveCfg = Release|x64 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.Build.0 = Release|x64 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.ActiveCfg = Release|Win32 - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.Build.0 = Release|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.Build.0 = Debug|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|ARM64.Build.0 = Debug|ARM64 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.ActiveCfg = Debug|x64 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.Build.0 = Debug|x64 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.ActiveCfg = Debug|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.Build.0 = Debug|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.ActiveCfg = Release|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.Build.0 = Release|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|ARM64.ActiveCfg = Release|ARM64 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|ARM64.Build.0 = Release|ARM64 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.ActiveCfg = Release|x64 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.Build.0 = Release|x64 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.ActiveCfg = Release|Win32 - {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.Build.0 = Release|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.Build.0 = Debug|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|ARM64.Build.0 = Debug|ARM64 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x64.ActiveCfg = Debug|x64 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x64.Build.0 = Debug|x64 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.ActiveCfg = Debug|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.Build.0 = Debug|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.ActiveCfg = Release|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.Build.0 = Release|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|ARM64.ActiveCfg = Release|ARM64 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|ARM64.Build.0 = Release|ARM64 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x64.ActiveCfg = Release|x64 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x64.Build.0 = Release|x64 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.ActiveCfg = Release|Win32 - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.Build.0 = Release|Win32 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.ActiveCfg = Debug|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.Build.0 = Debug|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|ARM64.ActiveCfg = Debug|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x64.ActiveCfg = Debug|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.ActiveCfg = Debug|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.Build.0 = Debug|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.ActiveCfg = Release|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.Build.0 = Release|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|ARM64.ActiveCfg = Release|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x64.ActiveCfg = Release|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.ActiveCfg = Release|x86 - {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.Build.0 = Release|x86 - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|ARM64.Build.0 = Debug|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.ActiveCfg = Debug|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.Build.0 = Debug|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.ActiveCfg = Debug|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.Build.0 = Debug|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.Build.0 = Release|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|ARM64.ActiveCfg = Release|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|ARM64.Build.0 = Release|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.ActiveCfg = Release|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.Build.0 = Release|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.ActiveCfg = Release|Any CPU - {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.Build.0 = Release|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|ARM64.Build.0 = Debug|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x64.ActiveCfg = Debug|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x64.Build.0 = Debug|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x86.ActiveCfg = Debug|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x86.Build.0 = Debug|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|Any CPU.Build.0 = Release|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|ARM64.ActiveCfg = Release|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|ARM64.Build.0 = Release|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x64.ActiveCfg = Release|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x64.Build.0 = Release|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x86.ActiveCfg = Release|Any CPU - {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x86.Build.0 = Release|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|ARM64.Build.0 = Debug|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.ActiveCfg = Debug|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.Build.0 = Debug|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.ActiveCfg = Debug|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.Build.0 = Debug|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.Build.0 = Release|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|ARM64.ActiveCfg = Release|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|ARM64.Build.0 = Release|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.ActiveCfg = Release|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.Build.0 = Release|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.ActiveCfg = Release|Any CPU - {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.Build.0 = Release|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|ARM64.Build.0 = Debug|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.ActiveCfg = Debug|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.Build.0 = Debug|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.ActiveCfg = Debug|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.Build.0 = Debug|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.Build.0 = Release|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|ARM64.ActiveCfg = Release|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|ARM64.Build.0 = Release|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.ActiveCfg = Release|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.Build.0 = Release|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.ActiveCfg = Release|Any CPU - {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.Build.0 = Release|Any CPU - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.Build.0 = Debug|Win32 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.Build.0 = Debug|ARM64 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.ActiveCfg = Debug|x64 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.Build.0 = Debug|x64 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.ActiveCfg = Debug|Win32 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.Build.0 = Debug|Win32 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.ActiveCfg = Release|Win32 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.Build.0 = Release|Win32 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.ActiveCfg = Release|ARM64 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.Build.0 = Release|ARM64 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.ActiveCfg = Release|x64 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.Build.0 = Release|x64 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.ActiveCfg = Release|Win32 - {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.Build.0 = Release|Win32 - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|ARM64.Build.0 = Debug|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.ActiveCfg = Debug|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.Build.0 = Debug|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.ActiveCfg = Debug|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.Build.0 = Debug|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.Build.0 = Release|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|ARM64.ActiveCfg = Release|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|ARM64.Build.0 = Release|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.ActiveCfg = Release|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.Build.0 = Release|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.ActiveCfg = Release|Any CPU - {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.Build.0 = Release|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Debug|ARM64.Build.0 = Debug|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.ActiveCfg = Debug|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.Build.0 = Debug|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.ActiveCfg = Debug|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.Build.0 = Debug|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.Build.0 = Release|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Release|ARM64.ActiveCfg = Release|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Release|ARM64.Build.0 = Release|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.ActiveCfg = Release|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.Build.0 = Release|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.ActiveCfg = Release|Any CPU - {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.Build.0 = Release|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|ARM64.Build.0 = Debug|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x64.ActiveCfg = Debug|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x64.Build.0 = Debug|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x86.ActiveCfg = Debug|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x86.Build.0 = Debug|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Release|Any CPU.Build.0 = Release|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Release|ARM64.ActiveCfg = Release|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Release|ARM64.Build.0 = Release|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.ActiveCfg = Release|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.Build.0 = Release|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.ActiveCfg = Release|Any CPU - {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.Build.0 = Release|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|ARM64.Build.0 = Debug|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.ActiveCfg = Debug|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.Build.0 = Debug|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.ActiveCfg = Debug|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.Build.0 = Debug|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.Build.0 = Release|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|ARM64.ActiveCfg = Release|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|ARM64.Build.0 = Release|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.ActiveCfg = Release|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.Build.0 = Release|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.ActiveCfg = Release|Any CPU - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.Build.0 = Release|Any CPU - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.Build.0 = Debug|Win32 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|ARM64.Build.0 = Debug|ARM64 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.ActiveCfg = Debug|x64 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.Build.0 = Debug|x64 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.ActiveCfg = Debug|Win32 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.Build.0 = Debug|Win32 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.ActiveCfg = Release|Win32 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.Build.0 = Release|Win32 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|ARM64.ActiveCfg = Release|ARM64 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|ARM64.Build.0 = Release|ARM64 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.ActiveCfg = Release|x64 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.Build.0 = Release|x64 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.ActiveCfg = Release|Win32 - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.Build.0 = Release|Win32 - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|ARM64.Build.0 = Debug|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.ActiveCfg = Debug|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.Build.0 = Debug|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.ActiveCfg = Debug|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.Build.0 = Debug|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.Build.0 = Release|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|ARM64.ActiveCfg = Release|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|ARM64.Build.0 = Release|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.ActiveCfg = Release|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.Build.0 = Release|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.ActiveCfg = Release|Any CPU - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.Build.0 = Release|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|ARM64.Build.0 = Debug|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.ActiveCfg = Debug|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.Build.0 = Debug|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.ActiveCfg = Debug|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.Build.0 = Debug|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.Build.0 = Release|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|ARM64.ActiveCfg = Release|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|ARM64.Build.0 = Release|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.ActiveCfg = Release|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.Build.0 = Release|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x86.ActiveCfg = Release|Any CPU - {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {CC4236FC-226E-4232-AB50-24CBEC4D314D} = {C70E3534-A018-4D0A-A340-916C9777EEF7} - {3D44B67D-A475-49BA-8310-E39F6C117CC9} = {C70E3534-A018-4D0A-A340-916C9777EEF7} - {44297646-706D-4508-8E96-1B35B109694C} = {C70E3534-A018-4D0A-A340-916C9777EEF7} - {1E86D8DF-DABD-4B6E-A812-64CD2040C73A} = {C70E3534-A018-4D0A-A340-916C9777EEF7} - {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618} = {C70E3534-A018-4D0A-A340-916C9777EEF7} - {8E707BF2-FD72-4649-8727-BA5955D48D40} = {C70E3534-A018-4D0A-A340-916C9777EEF7} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {74046961-48BF-467A-A6C2-F886C75CE0BE} - EndGlobalSection -EndGlobal diff --git a/README.md b/README.md deleted file mode 100644 index cc5d9b34..00000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Bal.wixext -WixToolset.Bal.wixext - Bootstrapper Application Layer WiX Toolset Extension diff --git a/appveyor.cmd b/appveyor.cmd deleted file mode 100644 index f4e9c26e..00000000 --- a/appveyor.cmd +++ /dev/null @@ -1,17 +0,0 @@ -@setlocal -@pushd %~dp0 -@set _C=Release - -nuget restore || exit /b - -msbuild -p:Configuration=%_C% -Restore || exit /b -msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b - -dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b -dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b - -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b -msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b - -@popd -@endlocal diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index 7c686b04..00000000 --- a/appveyor.yml +++ /dev/null @@ -1,40 +0,0 @@ -# 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. -# -# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml -# then update all of the repos. - -branches: - only: - - master - - develop - -image: Visual Studio 2019 - -version: 0.0.0.{build} -configuration: Release - -environment: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 - NUGET_XMLDOC_MODE: skip - -build_script: - - appveyor.cmd - -pull_requests: - do_not_increment_build_number: true - -nuget: - disable_publish_on_pr: true - -skip_branch_with_pr: true -skip_tags: true - -artifacts: -- path: build\Release\**\*.nupkg - name: nuget - -notifications: -- provider: Slack - incoming_webhook: - secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/global.json b/global.json deleted file mode 100644 index 697f5687..00000000 --- a/global.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "msbuild-sdks": { - "WixToolset.Sdk": "4.0.0-build-0213" - }, - "sdk": { - "allowPrerelease": false - } -} diff --git a/nuget.config b/nuget.config deleted file mode 100644 index f3277bc4..00000000 --- a/nuget.config +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/.editorconfig b/src/.editorconfig new file mode 100644 index 00000000..1d72e683 --- /dev/null +++ b/src/.editorconfig @@ -0,0 +1,37 @@ +# 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. +# +# Do NOT modify this file. Update the canonical version in Home\repo-template\src\.editorconfig +# then update all of the repos. + +root = true + +[*] +charset = utf-8 +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true + +[*.{cs,vb}] +dotnet_sort_system_directives_first = true + +[*.cs] +csharp_indent_case_contents = true : error +csharp_indent_switch_labels = true : error +csharp_new_line_before_open_brace = all +csharp_prefer_braces = true : error +csharp_style_expression_bodied_methods = when_on_single_line : suggestion +csharp_style_expression_bodied_constructors = when_on_single_line : suggestion +csharp_style_expression_bodied_operators = when_on_single_line : suggestion +csharp_style_expression_bodied_properties = when_on_single_line : suggestion +csharp_style_expression_bodied_indexers = when_on_single_line : suggestion +csharp_style_expression_bodied_accessors = when_on_single_line : suggestion +csharp_style_var_elsewhere = true : suggestion +csharp_style_var_for_built_in_types = true : suggestion +csharp_style_var_when_type_is_apparent = true : suggestion +dotnet_style_qualification_for_event = true : error +dotnet_style_qualification_for_field = true : error +dotnet_style_qualification_for_method = true : error +dotnet_style_qualification_for_property = true : error + +[*.targets] +indent_size = 2 diff --git a/src/CSharp.Build.props b/src/CSharp.Build.props deleted file mode 100644 index 81d24ad1..00000000 --- a/src/CSharp.Build.props +++ /dev/null @@ -1,13 +0,0 @@ - - - - - true - true - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) - false - - diff --git a/src/Cpp.Build.props b/src/Cpp.Build.props deleted file mode 100644 index e7bba117..00000000 --- a/src/Cpp.Build.props +++ /dev/null @@ -1,94 +0,0 @@ - - - - - - Win32 - $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ - $(OutputPath)$(Platform)\ - - - $(Company) - $(Copyright) - - - - $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) - - - - $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset - - - - - $(DisableSpecificCompilerWarnings) - Level4 - $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) - WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) - Use - precomp.h - StdCall - true - false - -YlprecompDefine - /Zc:threadSafeInit- %(AdditionalOptions) - true - - - $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) - $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) - - - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) - - - $(ProjectSubSystem) - $(ProjectModuleDefinitionFile) - $(ResourceOnlyDll) - true - $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) - $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) - /IGNORE:4099 %(AdditionalOptions) - - - - - - NoExtensions - - - - - CDecl - - - - - OldStyle - true - true - - - - - Disabled - EnableFastChecks - _DEBUG;DEBUG;%(PreprocessorDefinitions) - MultiThreadedDebug - - - - - MinSpace - NDEBUG;%(PreprocessorDefinitions) - true - true - MultiThreaded - - - true - true - - - diff --git a/src/Custom.Build.props b/src/Custom.Build.props deleted file mode 100644 index 66e74d81..00000000 --- a/src/Custom.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - $(OutputPath)examples\$(ProjectName)\ - - - $(OutDir)examples\$(ProjectName)\ - - diff --git a/src/CustomizedNativeRecommendedRules.ruleset b/src/CustomizedNativeRecommendedRules.ruleset deleted file mode 100644 index 142b141c..00000000 --- a/src/CustomizedNativeRecommendedRules.ruleset +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/Directory.Build.props b/src/Directory.Build.props deleted file mode 100644 index f83cc154..00000000 --- a/src/Directory.Build.props +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Debug - false - MSB3246 - - $(MSBuildProjectName) - $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) - $(BaseOutputPath)obj\$(ProjectName)\ - $(BaseOutputPath)$(Configuration)\ - - WiX Toolset Team - WiX Toolset - Copyright (c) .NET Foundation and contributors. All rights reserved. - MS-RL - WiX Toolset - - - - - - - diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets deleted file mode 100644 index cb988931..00000000 --- a/src/Directory.Build.targets +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - false - $(OutputPath)\$(AssemblyName).xml - - - - true - $(SolutionPath) - $(NCrunchOriginalSolutionPath) - - - - - - - $([System.IO.File]::ReadAllText($(TheSolutionPath))) - $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) - (?<="[PackageName]", ")(.*)(?=", ") - - - - - - %(Identity) - $(SolutionFileContent.Contains('\%(Identity).csproj')) - - - - - $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) - $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) - - - - - - - - - - - - - - diff --git a/src/Samples/bafunctions/Readme.txt b/src/Samples/bafunctions/Readme.txt deleted file mode 100644 index 517d0d4c..00000000 --- a/src/Samples/bafunctions/Readme.txt +++ /dev/null @@ -1,85 +0,0 @@ - -This is a sample project showing how to create a BA function assembly. - -The four interfaces are in the WixSampleBAFunctions.cpp file. - - -Example code: -~~~~~~~~~~~~~ - - - HRESULT hr = S_OK; - HKEY hkKey = NULL; - LPWSTR sczValue = NULL; - LPWSTR sczFormatedValue = NULL; - - - //--------------------------------------------------------------------------------------------- - // Example of BA function failure - hr = E_NOTIMPL; - BalExitOnFailure(hr, "Test failure."); - //--------------------------------------------------------------------------------------------- - - //--------------------------------------------------------------------------------------------- - // Example of setting a variables - hr = m_pEngine->SetVariableString(L"Variable1", L"String value"); - BalExitOnFailure(hr, "Failed to set variable."); - hr = m_pEngine->SetVariableNumeric(L"Variable2", 1234); - BalExitOnFailure(hr, "Failed to set variable."); - //--------------------------------------------------------------------------------------------- - - //--------------------------------------------------------------------------------------------- - // Example of reading burn variable. - BalGetStringVariable(L"WixBundleName", &sczValue); - BalExitOnFailure(hr, "Failed to get variable."); - - hr = m_pEngine->SetVariableString(L"Variable4", sczValue); - BalExitOnFailure(hr, "Failed to set variable."); - //--------------------------------------------------------------------------------------------- - - ReleaseNullStr(sczValue); // Release string so it can be re-used - - //--------------------------------------------------------------------------------------------- - // Examples of reading burn variable and formatting it. - BalGetStringVariable(L"InstallFolder", &sczValue); - BalExitOnFailure(hr, "Failed to get variable."); - - hr = m_pEngine->SetVariableString(L"Variable5", sczValue); - BalExitOnFailure(hr, "Failed to set variable."); - - BalFormatString(sczValue, &sczFormatedValue); - BalExitOnFailure(hr, "Failed to format variable."); - - hr = m_pEngine->SetVariableString(L"Variable6", sczFormatedValue); - BalExitOnFailure(hr, "Failed to set variable."); - //--------------------------------------------------------------------------------------------- - - ReleaseNullStr(sczValue); // Release string so it can be re-used - - //--------------------------------------------------------------------------------------------- - // Example of reading 64 bit registry and setting the InstallFolder variable to the value read. - hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v3.5", KEY_READ | KEY_WOW64_64KEY, &hkKey); - BalExitOnFailure(hr, "Failed to open registry key."); - - hr = RegReadString(hkKey, L"InstallPath", &sczValue); - BalExitOnFailure(hr, "Failed to read registry value."); - - // Example of function call - PathBackslashTerminate(&sczValue); - - hr = m_pEngine->SetVariableString(L"InstallFolder", sczValue); - BalExitOnFailure(hr, "Failed to set variable."); - //--------------------------------------------------------------------------------------------- - - ReleaseNullStr(sczValue); // Release string so it can be re-used - - //--------------------------------------------------------------------------------------------- - // Example of calling a function that return HRESULT - hr = GetFileVersion(); - BalExitOnFailure(hr, "Failed to get version."); - //--------------------------------------------------------------------------------------------- - - LExit: - ReleaseRegKey(hkKey); - ReleaseStr(sczValue); - ReleaseStr(sczFormatedValue); diff --git a/src/Samples/bafunctions/WixSampleBAFunctions.cpp b/src/Samples/bafunctions/WixSampleBAFunctions.cpp deleted file mode 100644 index 531b86a3..00000000 --- a/src/Samples/bafunctions/WixSampleBAFunctions.cpp +++ /dev/null @@ -1,95 +0,0 @@ -// 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. - -#include "precomp.h" -#include "BalBaseBAFunctions.h" -#include "BalBaseBAFunctionsProc.h" - -class CWixSampleBAFunctions : public CBalBaseBAFunctions -{ -public: // IBootstrapperApplication - virtual STDMETHODIMP OnDetectBegin( - __in BOOL fInstalled, - __in DWORD cPackages, - __inout BOOL* pfCancel - ) - { - HRESULT hr = S_OK; - - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Running detect begin BA function. fInstalled=%d, cPackages=%u, fCancel=%d", fInstalled, cPackages, *pfCancel); - - //------------------------------------------------------------------------------------------------- - // YOUR CODE GOES HERE - BalExitOnFailure(hr, "Change this message to represent real error handling."); - //------------------------------------------------------------------------------------------------- - - LExit: - return hr; - } - -public: // IBAFunctions - virtual STDMETHODIMP OnPlanBegin( - __in DWORD cPackages, - __inout BOOL* pfCancel - ) - { - HRESULT hr = S_OK; - - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Running plan begin BA function. cPackages=%u, fCancel=%d", cPackages, *pfCancel); - - //------------------------------------------------------------------------------------------------- - // YOUR CODE GOES HERE - BalExitOnFailure(hr, "Change this message to represent real error handling."); - //------------------------------------------------------------------------------------------------- - - LExit: - return hr; - } - -public: - // - // Constructor - initialize member variables. - // - CWixSampleBAFunctions( - __in HMODULE hModule, - __in IBootstrapperEngine* pEngine, - __in const BA_FUNCTIONS_CREATE_ARGS* pArgs - ) : CBalBaseBAFunctions(hModule, pEngine, pArgs) - { - } - - // - // Destructor - release member variables. - // - ~CWixSampleBAFunctions() - { - } -}; - - -HRESULT WINAPI CreateBAFunctions( - __in HMODULE hModule, - __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, - __inout BA_FUNCTIONS_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - CWixSampleBAFunctions* pBAFunctions = NULL; - IBootstrapperEngine* pEngine = NULL; - - // This is required to enable logging functions. - hr = BalInitializeFromCreateArgs(pArgs->pBootstrapperCreateArgs, &pEngine); - ExitOnFailure(hr, "Failed to initialize Bal."); - - pBAFunctions = new CWixSampleBAFunctions(hModule, pEngine, pArgs); - ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CWixSampleBAFunctions object."); - - pResults->pfnBAFunctionsProc = BalBaseBAFunctionsProc; - pResults->pvBAFunctionsProcContext = pBAFunctions; - pBAFunctions = NULL; - -LExit: - ReleaseObject(pBAFunctions); - ReleaseObject(pEngine); - - return hr; -} diff --git a/src/Samples/bafunctions/bafunctions.cpp b/src/Samples/bafunctions/bafunctions.cpp deleted file mode 100644 index b20f4230..00000000 --- a/src/Samples/bafunctions/bafunctions.cpp +++ /dev/null @@ -1,46 +0,0 @@ -// 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. - -#include "precomp.h" - -static HINSTANCE vhInstance = NULL; - -extern "C" BOOL WINAPI DllMain( - IN HINSTANCE hInstance, - IN DWORD dwReason, - IN LPVOID /* pvReserved */ - ) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - ::DisableThreadLibraryCalls(hInstance); - vhInstance = hInstance; - break; - - case DLL_PROCESS_DETACH: - vhInstance = NULL; - break; - } - - return TRUE; -} - -extern "C" HRESULT WINAPI BAFunctionsCreate( - __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, - __inout BA_FUNCTIONS_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - - hr = CreateBAFunctions(vhInstance, pArgs, pResults); - BalExitOnFailure(hr, "Failed to create BAFunctions interface."); - -LExit: - return hr; -} - -extern "C" void WINAPI BAFunctionsDestroy( - ) -{ - BalUninitialize(); -} diff --git a/src/Samples/bafunctions/bafunctions.def b/src/Samples/bafunctions/bafunctions.def deleted file mode 100644 index 6e016dad..00000000 --- a/src/Samples/bafunctions/bafunctions.def +++ /dev/null @@ -1,6 +0,0 @@ -; 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. - - -EXPORTS - BAFunctionsCreate - BAFunctionsDestroy diff --git a/src/Samples/bafunctions/bafunctions.vcxproj b/src/Samples/bafunctions/bafunctions.vcxproj deleted file mode 100644 index 640c812d..00000000 --- a/src/Samples/bafunctions/bafunctions.vcxproj +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02} - DynamicLibrary - v142 - Unicode - BAFunctions - bafunctions.def - - - - - - - comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib - - - - - Create - - - - - - - - - - - - - - - - - - - - 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}. - - - - - - - diff --git a/src/Samples/bafunctions/packages.config b/src/Samples/bafunctions/packages.config deleted file mode 100644 index 548ddb48..00000000 --- a/src/Samples/bafunctions/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/Samples/bafunctions/precomp.h b/src/Samples/bafunctions/precomp.h deleted file mode 100644 index 9d2fe726..00000000 --- a/src/Samples/bafunctions/precomp.h +++ /dev/null @@ -1,52 +0,0 @@ -#pragma once -// 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. - - -#include - -#pragma warning(push) -#pragma warning(disable:4458) // declaration of 'xxx' hides class member -#include -#pragma warning(pop) - -#include -#include -#include -#include -#include -#include -#include - -// Standard WiX header files, include as required -#include "dutil.h" -//#include "memutil.h" -//#include "dictutil.h" -//#include "dirutil.h" -#include "fileutil.h" -#include "locutil.h" -//#include "logutil.h" -#include "pathutil.h" -//#include "resrutil.h" -//#include "shelutil.h" -#include "strutil.h" -#include "thmutil.h" -//#include "uriutil.h" -//#include "xmlutil.h" -#include "regutil.h" - -//#include "IBootstrapperEngine.h" -//#include "IBootstrapperApplication.h" - -#include "BalBaseBootstrapperApplication.h" -//#include "balinfo.h" -//#include "balcondition.h" -#include "balutil.h" - -#include "BAFunctions.h" -#include "IBAFunctions.h" - -HRESULT WINAPI CreateBAFunctions( - __in HMODULE hModule, - __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, - __inout BA_FUNCTIONS_CREATE_RESULTS* pResults - ); diff --git a/src/Samples/bafunctions/resource.h b/src/Samples/bafunctions/resource.h deleted file mode 100644 index 149a8ff4..00000000 --- a/src/Samples/bafunctions/resource.h +++ /dev/null @@ -1,15 +0,0 @@ -// 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. - -#define IDC_STATIC -1 - - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1003 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs b/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs deleted file mode 100644 index d38fd1a9..00000000 --- a/src/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs +++ /dev/null @@ -1,89 +0,0 @@ -// 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. - -namespace WixToolset.Dnc.Host -{ - using System; - using System.Linq; - using System.Reflection; - using System.Runtime.InteropServices; - - delegate IBootstrapperApplicationFactory StaticEntryDelegate([MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyName, [MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyPath); - - /// - /// Entry point for the .NET Core host to create and return the BA to the engine. - /// Reflection is used instead of referencing WixToolset.Mba.Core directly to avoid requiring it in the AssemblyLoadContext. - /// - public sealed class BootstrapperApplicationFactory : IBootstrapperApplicationFactory - { - private string baFactoryAssemblyName; - private string baFactoryAssemblyPath; - - public BootstrapperApplicationFactory(string baFactoryAssemblyName, string baFactoryAssemblyPath) - { - this.baFactoryAssemblyName = baFactoryAssemblyName; - this.baFactoryAssemblyPath = baFactoryAssemblyPath; - } - - /// - /// Loads the bootstrapper application assembly and calls its IBootstrapperApplicationFactory.Create method. - /// - /// Pointer to BOOTSTRAPPER_CREATE_ARGS struct. - /// Pointer to BOOTSTRAPPER_CREATE_RESULTS struct. - /// The bootstrapper application assembly - /// does not define the . - public void Create(IntPtr pArgs, IntPtr pResults) - { - // Load the BA's IBootstrapperApplicationFactory. - var baFactoryType = BootstrapperApplicationFactory.GetBAFactoryTypeFromAssembly(this.baFactoryAssemblyName, this.baFactoryAssemblyPath); - var baFactory = Activator.CreateInstance(baFactoryType); - if (null == baFactory) - { - throw new InvalidBootstrapperApplicationFactoryException(); - } - - var createMethod = baFactoryType.GetMethod(nameof(Create), new[] { typeof(IntPtr), typeof(IntPtr) }); - if (null == createMethod) - { - throw new InvalidBootstrapperApplicationFactoryException(); - } - createMethod.Invoke(baFactory, new object[] { pArgs, pResults }); - } - - /// - /// Locates the and returns the specified type. - /// - /// The assembly that defines the IBootstrapperApplicationFactory implementation. - /// The bootstrapper application factory . - private static Type GetBAFactoryTypeFromAssembly(string assemblyName, string assemblyPath) - { - // The default ALC shouldn't need help loading the assembly, since the host should have provided the deps.json - // when starting the runtime. But it doesn't hurt so keep this in case an isolated ALC is ever needed. - var alc = new DnchostAssemblyLoadContext(assemblyPath, false); - var asm = alc.LoadFromAssemblyName(new AssemblyName(assemblyName)); - - var attr = asm.GetCustomAttributes() - .Where(a => a.GetType().FullName == "WixToolset.Mba.Core.BootstrapperApplicationFactoryAttribute") - .SingleOrDefault(); - - if (null == attr) - { - throw new MissingAttributeException(); - } - - var baFactoryTypeProperty = attr.GetType().GetProperty("BootstrapperApplicationFactoryType", typeof(Type)); - if (baFactoryTypeProperty == null || baFactoryTypeProperty.GetMethod == null) - { - throw new MissingAttributeException(); - } - - var baFactoryType = (Type)baFactoryTypeProperty.GetMethod.Invoke(attr, null); - return baFactoryType; - } - - // Entry point for the DNC host. - public static IBootstrapperApplicationFactory CreateBAFactory([MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyName, [MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyPath) - { - return new BootstrapperApplicationFactory(baFactoryAssemblyName, baFactoryAssemblyPath); - } - } -} diff --git a/src/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs b/src/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs deleted file mode 100644 index 1a383058..00000000 --- a/src/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs +++ /dev/null @@ -1,58 +0,0 @@ -// 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. - -namespace WixToolset.Dnc.Host -{ - using System; - using System.Reflection; - using System.Runtime.Loader; - - public sealed class DnchostAssemblyLoadContext : AssemblyLoadContext - { - private readonly AssemblyDependencyResolver resolver; - - public DnchostAssemblyLoadContext(string assemblyPath, bool isolateFromDefault) - : base(nameof(DnchostAssemblyLoadContext), isolateFromDefault) - { - this.resolver = new AssemblyDependencyResolver(assemblyPath); - - if (!this.IsCollectible) - { - AssemblyLoadContext.Default.Resolving += this.ResolveAssembly; - AssemblyLoadContext.Default.ResolvingUnmanagedDll += this.ResolveUnmanagedDll; - } - } - - private Assembly ResolveAssembly(AssemblyLoadContext defaultAlc, AssemblyName assemblyName) - { - var path = this.resolver.ResolveAssemblyToPath(assemblyName); - if (path != null) - { - var targetAlc = this.IsCollectible ? this : defaultAlc; - return targetAlc.LoadFromAssemblyPath(path); - } - - return null; - } - - private IntPtr ResolveUnmanagedDll(Assembly assembly, string unmanagedDllName) - { - var path = this.resolver.ResolveUnmanagedDllToPath(unmanagedDllName); - if (path != null) - { - return this.LoadUnmanagedDllFromPath(path); - } - - return IntPtr.Zero; - } - - protected override Assembly Load(AssemblyName assemblyName) - { - return this.ResolveAssembly(AssemblyLoadContext.Default, assemblyName); - } - - protected override IntPtr LoadUnmanagedDll(string unmanagedDllName) - { - return this.ResolveUnmanagedDll(null, unmanagedDllName); - } - } -} diff --git a/src/WixToolset.Dnc.Host/Exceptions.cs b/src/WixToolset.Dnc.Host/Exceptions.cs deleted file mode 100644 index 32d4d4c5..00000000 --- a/src/WixToolset.Dnc.Host/Exceptions.cs +++ /dev/null @@ -1,145 +0,0 @@ -// 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. - -namespace WixToolset.Dnc.Host -{ - using System; - using System.Runtime.Serialization; - - /// - /// Base class for exception returned to the bootstrapper application host. - /// - [Serializable] - public abstract class BootstrapperException : Exception - { - /// - /// Creates an instance of the base class with the given HRESULT. - /// - /// The HRESULT for the exception that is used by the bootstrapper application host. - public BootstrapperException(int hr) - { - this.HResult = hr; - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message. - public BootstrapperException(string message) - : base(message) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message - /// Inner exception associated with this one - public BootstrapperException(string message, Exception innerException) - : base(message, innerException) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Serialization information for this exception - /// Streaming context to serialize to - protected BootstrapperException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } - } - - /// - /// The bootstrapper application assembly loaded by the host does not contain exactly one instance of the - /// class. - /// - /// - [Serializable] - public class MissingAttributeException : BootstrapperException - { - /// - /// Creates a new instance of the class. - /// - public MissingAttributeException() - : base(NativeMethods.E_NOTFOUND) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message. - public MissingAttributeException(string message) - : base(message) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message - /// Inner exception associated with this one - public MissingAttributeException(string message, Exception innerException) - : base(message, innerException) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Serialization information for this exception - /// Streaming context to serialize to - protected MissingAttributeException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } - } - - /// - /// The bootstrapper application factory specified by the - /// does not extend the base class. - /// - /// - /// - [Serializable] - public class InvalidBootstrapperApplicationFactoryException : BootstrapperException - { - /// - /// Creates a new instance of the class. - /// - public InvalidBootstrapperApplicationFactoryException() - : base(NativeMethods.E_UNEXPECTED) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message. - public InvalidBootstrapperApplicationFactoryException(string message) - : base(message) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message - /// Inner exception associated with this one - public InvalidBootstrapperApplicationFactoryException(string message, Exception innerException) - : base(message, innerException) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Serialization information for this exception - /// Streaming context to serialize to - protected InvalidBootstrapperApplicationFactoryException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } - } -} diff --git a/src/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs b/src/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs deleted file mode 100644 index 96731192..00000000 --- a/src/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs +++ /dev/null @@ -1,16 +0,0 @@ -// 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. - -namespace WixToolset.Dnc.Host -{ - using System; - using System.Runtime.InteropServices; - - [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] - public interface IBootstrapperApplicationFactory - { - void Create( - IntPtr pArgs, - IntPtr pResults - ); - } -} diff --git a/src/WixToolset.Dnc.Host/NativeMethods.cs b/src/WixToolset.Dnc.Host/NativeMethods.cs deleted file mode 100644 index 6dc393c6..00000000 --- a/src/WixToolset.Dnc.Host/NativeMethods.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -namespace WixToolset.Dnc.Host -{ - using System; - using System.Runtime.InteropServices; - - /// - /// Contains native constants, functions, and structures for this assembly. - /// - internal static class NativeMethods - { - #region Error Constants - internal const int E_NOTFOUND = unchecked((int)0x80070490); - internal const int E_UNEXPECTED = unchecked((int)0x8000ffff); - #endregion - } -} diff --git a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj deleted file mode 100644 index f347ca0b..00000000 --- a/src/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - netcoreapp3.1 - WixToolset.Dnc.Host - WiX Toolset .NET Core BA Host - WiX Toolset .NET Core BA Host - embedded - AnyCPU - - - - - False - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs b/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs deleted file mode 100644 index 78e68bd9..00000000 --- a/src/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs +++ /dev/null @@ -1,86 +0,0 @@ -// 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. - -namespace WixToolset.Mba.Host -{ - using System; - using System.Configuration; - using System.Reflection; - using System.Runtime.InteropServices; - using WixToolset.Mba.Core; - - /// - /// Entry point for the managed host to create and return the BA to the engine. - /// - [ClassInterface(ClassInterfaceType.None)] - public sealed class BootstrapperApplicationFactory : MarshalByRefObject, IBootstrapperApplicationFactory - { - /// - /// Creates a new instance of the class. - /// Entry point for the MBA host. - /// - public BootstrapperApplicationFactory() - { - } - - /// - /// Loads the bootstrapper application assembly and calls its IBootstrapperApplicationFactory.Create method. - /// - /// Pointer to BOOTSTRAPPER_CREATE_ARGS struct. - /// Pointer to BOOTSTRAPPER_CREATE_RESULTS struct. - /// The bootstrapper application assembly - /// does not define the . - public void Create(IntPtr pArgs, IntPtr pResults) - { - // Get the wix.boostrapper section group to get the name of the bootstrapper application assembly to host. - var section = ConfigurationManager.GetSection("wix.bootstrapper/host") as HostSection; - if (null == section) - { - throw new MissingAttributeException(); // TODO: throw a more specific exception than this. - } - - // Load the BA's IBootstrapperApplicationFactory. - var baFactoryType = BootstrapperApplicationFactory.GetBAFactoryTypeFromAssembly(section.AssemblyName); - var baFactory = (IBootstrapperApplicationFactory)Activator.CreateInstance(baFactoryType); - if (null == baFactory) - { - throw new InvalidBootstrapperApplicationFactoryException(); - } - - baFactory.Create(pArgs, pResults); - } - - /// - /// Locates the and returns the specified type. - /// - /// The assembly that defines the IBootstrapperApplicationFactory implementation. - /// The bootstrapper application factory . - private static Type GetBAFactoryTypeFromAssembly(string assemblyName) - { - Type baFactoryType = null; - - // Load the requested assembly. - Assembly asm = AppDomain.CurrentDomain.Load(assemblyName); - - // If an assembly was loaded and is not the current assembly, check for the required attribute. - // This is done to avoid using the BootstrapperApplicationFactoryAttribute which we use at build time - // to specify the BootstrapperApplicationFactory assembly in the manifest. - if (!Assembly.GetExecutingAssembly().Equals(asm)) - { - // There must be one and only one BootstrapperApplicationFactoryAttribute. - // The attribute prevents multiple declarations already. - var attrs = (BootstrapperApplicationFactoryAttribute[])asm.GetCustomAttributes(typeof(BootstrapperApplicationFactoryAttribute), false); - if (null != attrs) - { - baFactoryType = attrs[0].BootstrapperApplicationFactoryType; - } - } - - if (null == baFactoryType) - { - throw new MissingAttributeException(); - } - - return baFactoryType; - } - } -} diff --git a/src/WixToolset.Mba.Host/BootstrapperSectionGroup.cs b/src/WixToolset.Mba.Host/BootstrapperSectionGroup.cs deleted file mode 100644 index 5cf1bc9c..00000000 --- a/src/WixToolset.Mba.Host/BootstrapperSectionGroup.cs +++ /dev/null @@ -1,29 +0,0 @@ -// 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. - -namespace WixToolset.Mba.Host -{ - using System; - using System.Configuration; - - /// - /// Handler for the wix.bootstrapper configuration section group. - /// - public class BootstrapperSectionGroup : ConfigurationSectionGroup - { - /// - /// Creates a new instance of the class. - /// - public BootstrapperSectionGroup() - { - } - - /// - /// Gets the handler for the mba configuration section. - /// - [ConfigurationProperty("host")] - public HostSection Host - { - get { return (HostSection)base.Sections["host"]; } - } - } -} diff --git a/src/WixToolset.Mba.Host/Exceptions.cs b/src/WixToolset.Mba.Host/Exceptions.cs deleted file mode 100644 index c68951f0..00000000 --- a/src/WixToolset.Mba.Host/Exceptions.cs +++ /dev/null @@ -1,145 +0,0 @@ -// 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. - -namespace WixToolset.Mba.Host -{ - using System; - using System.Runtime.Serialization; - - /// - /// Base class for exception returned to the bootstrapper application host. - /// - [Serializable] - public abstract class BootstrapperException : Exception - { - /// - /// Creates an instance of the base class with the given HRESULT. - /// - /// The HRESULT for the exception that is used by the bootstrapper application host. - public BootstrapperException(int hr) - { - this.HResult = hr; - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message. - public BootstrapperException(string message) - : base(message) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message - /// Inner exception associated with this one - public BootstrapperException(string message, Exception innerException) - : base(message, innerException) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Serialization information for this exception - /// Streaming context to serialize to - protected BootstrapperException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } - } - - /// - /// The bootstrapper application assembly loaded by the host does not contain exactly one instance of the - /// class. - /// - /// - [Serializable] - public class MissingAttributeException : BootstrapperException - { - /// - /// Creates a new instance of the class. - /// - public MissingAttributeException() - : base(NativeMethods.E_NOTFOUND) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message. - public MissingAttributeException(string message) - : base(message) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message - /// Inner exception associated with this one - public MissingAttributeException(string message, Exception innerException) - : base(message, innerException) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Serialization information for this exception - /// Streaming context to serialize to - protected MissingAttributeException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } - } - - /// - /// The bootstrapper application factory specified by the - /// does not extend the base class. - /// - /// - /// - [Serializable] - public class InvalidBootstrapperApplicationFactoryException : BootstrapperException - { - /// - /// Creates a new instance of the class. - /// - public InvalidBootstrapperApplicationFactoryException() - : base(NativeMethods.E_UNEXPECTED) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message. - public InvalidBootstrapperApplicationFactoryException(string message) - : base(message) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Exception message - /// Inner exception associated with this one - public InvalidBootstrapperApplicationFactoryException(string message, Exception innerException) - : base(message, innerException) - { - } - - /// - /// Initializes a new instance of the class. - /// - /// Serialization information for this exception - /// Streaming context to serialize to - protected InvalidBootstrapperApplicationFactoryException(SerializationInfo info, StreamingContext context) - : base(info, context) - { - } - } -} diff --git a/src/WixToolset.Mba.Host/HostSection.cs b/src/WixToolset.Mba.Host/HostSection.cs deleted file mode 100644 index 632025c7..00000000 --- a/src/WixToolset.Mba.Host/HostSection.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -namespace WixToolset.Mba.Host -{ - using System; - using System.Configuration; - - /// - /// Handler for the Host configuration section. - /// - public sealed class HostSection : ConfigurationSection - { - private static readonly ConfigurationProperty assemblyNameProperty = new ConfigurationProperty("assemblyName", typeof(string), null, ConfigurationPropertyOptions.IsRequired); - private static readonly ConfigurationProperty supportedFrameworksProperty = new ConfigurationProperty("", typeof(SupportedFrameworkElementCollection), null, ConfigurationPropertyOptions.IsDefaultCollection); - - /// - /// Creates a new instance of the class. - /// - public HostSection() - { - } - - /// - /// Gets the name of the assembly that contians the child class. - /// - /// - /// The assembly specified by this name must contain the to identify - /// the type of the child class. - /// - [ConfigurationProperty("assemblyName", IsRequired = true)] - public string AssemblyName - { - get { return (string)base[assemblyNameProperty]; } - set { base[assemblyNameProperty] = value; } - } - - /// - /// Gets the of supported frameworks for the host configuration. - /// - [ConfigurationProperty("", IsDefaultCollection = true)] - [ConfigurationCollection(typeof(SupportedFrameworkElement))] - public SupportedFrameworkElementCollection SupportedFrameworks - { - get { return (SupportedFrameworkElementCollection)base[supportedFrameworksProperty]; } - } - } -} diff --git a/src/WixToolset.Mba.Host/NativeMethods.cs b/src/WixToolset.Mba.Host/NativeMethods.cs deleted file mode 100644 index b9fc85a0..00000000 --- a/src/WixToolset.Mba.Host/NativeMethods.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -namespace WixToolset.Mba.Host -{ - using System; - using System.Runtime.InteropServices; - - /// - /// Contains native constants, functions, and structures for this assembly. - /// - internal static class NativeMethods - { - #region Error Constants - internal const int E_NOTFOUND = unchecked((int)0x80070490); - internal const int E_UNEXPECTED = unchecked((int)0x8000ffff); - #endregion - } -} diff --git a/src/WixToolset.Mba.Host/SupportedFrameworkElement.cs b/src/WixToolset.Mba.Host/SupportedFrameworkElement.cs deleted file mode 100644 index fe7fd2eb..00000000 --- a/src/WixToolset.Mba.Host/SupportedFrameworkElement.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -namespace WixToolset.Mba.Host -{ - using System; - using System.Configuration; - - /// - /// Handler for the supportedFramework configuration section. - /// - public sealed class SupportedFrameworkElement : ConfigurationElement - { - private static readonly ConfigurationProperty versionProperty = new ConfigurationProperty("version", typeof(string), null, ConfigurationPropertyOptions.IsRequired); - private static readonly ConfigurationProperty runtimeVersionProperty = new ConfigurationProperty("runtimeVersion", typeof(string)); - - /// - /// Creates a new instance of the class. - /// - public SupportedFrameworkElement() - { - } - - /// - /// Gets the version of the supported framework. - /// - /// - /// The assembly specified by this name must contain a value matching the NETFX version registry key under - /// "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP". - /// - [ConfigurationProperty("version", IsRequired = true)] - public string Version - { - get { return (string)base[versionProperty]; } - set { base[versionProperty] = value; } - } - - /// - /// Gets the runtime version required by this supported framework. - /// - [ConfigurationProperty("runtimeVersion", IsRequired = false)] - public string RuntimeVersion - { - get { return (string)base[runtimeVersionProperty]; } - set { base[runtimeVersionProperty] = value; } - } - } -} diff --git a/src/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs b/src/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs deleted file mode 100644 index 12c7cf3e..00000000 --- a/src/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs +++ /dev/null @@ -1,36 +0,0 @@ -// 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. - -namespace WixToolset.Mba.Host -{ - using System; - using System.Configuration; - using System.Diagnostics.CodeAnalysis; - - /// - /// Handler for the supportedFramework collection. - /// - [SuppressMessage("Microsoft.Design", "CA1010:CollectionsShouldImplementGenericInterface")] - [ConfigurationCollection(typeof(SupportedFrameworkElement), AddItemName = "supportedFramework", CollectionType = ConfigurationElementCollectionType.BasicMap)] - public sealed class SupportedFrameworkElementCollection : ConfigurationElementCollection - { - public override ConfigurationElementCollectionType CollectionType - { - get { return ConfigurationElementCollectionType.BasicMap; } - } - - protected override string ElementName - { - get { return "supportedFramework"; } - } - - protected override ConfigurationElement CreateNewElement() - { - return new SupportedFrameworkElement(); - } - - protected override object GetElementKey(ConfigurationElement element) - { - return (element as SupportedFrameworkElement).Version; - } - } -} diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.config b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.config deleted file mode 100644 index a19b66f1..00000000 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.config +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - - - diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj deleted file mode 100644 index 3ee0ad1e..00000000 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - WixToolset.Mba.Host - WixToolset.Mba.Host - net20 - Managed Bootstrapper Application entry point - embedded - $(MSBuildThisFileName).nuspec - AnyCPU - - - - - - - - - - - - - - - - False - - - - - - - - - - - - - - - - - - - - - - $(OutputPath) - Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl) - - - \ No newline at end of file diff --git a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec deleted file mode 100644 index 00fd21ac..00000000 --- a/src/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec +++ /dev/null @@ -1,23 +0,0 @@ - - - - $id$ - $version$ - WiX Toolset Team - WiX Toolset Team - MS-RL - https://github.com/wixtoolset/Bal.wixext - false - $description$ - $copyright$ - - - - - - - - - - - diff --git a/src/dnchost/coreclrhost.h b/src/dnchost/coreclrhost.h deleted file mode 100644 index 07f28735..00000000 --- a/src/dnchost/coreclrhost.h +++ /dev/null @@ -1,137 +0,0 @@ -// Licensed to the .NET Foundation under one or more agreements. -// The .NET Foundation licenses this file to you under the MIT license. -// See the LICENSE file in the project root for more information. - - - -// ***** ABOUT THIS HEADER ***** -// ************************************************************************************** -// -// This is the version on 2019-12-22 from -// https://github.com/dotnet/runtime/blob/master/src/coreclr/src/coreclr/hosts/inc/coreclrhost.h -// -// ************************************************************************************** -// **************************** - - -// -// APIs for hosting CoreCLR -// - -#ifndef __CORECLR_HOST_H__ -#define __CORECLR_HOST_H__ - -#if defined(_WIN32) && defined(_M_IX86) -#define CORECLR_CALLING_CONVENTION __stdcall -#else -#define CORECLR_CALLING_CONVENTION -#endif - -// For each hosting API, we define a function prototype and a function pointer -// The prototype is useful for implicit linking against the dynamic coreclr -// library and the pointer for explicit dynamic loading (dlopen, LoadLibrary) -#define CORECLR_HOSTING_API(function, ...) \ - extern "C" int CORECLR_CALLING_CONVENTION function(__VA_ARGS__); \ - typedef int (CORECLR_CALLING_CONVENTION *function##_ptr)(__VA_ARGS__) - -// -// Initialize the CoreCLR. Creates and starts CoreCLR host and creates an app domain -// -// Parameters: -// exePath - Absolute path of the executable that invoked the ExecuteAssembly (the native host application) -// appDomainFriendlyName - Friendly name of the app domain that will be created to execute the assembly -// propertyCount - Number of properties (elements of the following two arguments) -// propertyKeys - Keys of properties of the app domain -// propertyValues - Values of properties of the app domain -// hostHandle - Output parameter, handle of the created host -// domainId - Output parameter, id of the created app domain -// -// Returns: -// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed -// -CORECLR_HOSTING_API(coreclr_initialize, - const char* exePath, - const char* appDomainFriendlyName, - int propertyCount, - const char** propertyKeys, - const char** propertyValues, - void** hostHandle, - unsigned int* domainId); - -// -// Shutdown CoreCLR. It unloads the app domain and stops the CoreCLR host. -// -// Parameters: -// hostHandle - Handle of the host -// domainId - Id of the domain -// -// Returns: -// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed -// -CORECLR_HOSTING_API(coreclr_shutdown, - void* hostHandle, - unsigned int domainId); - -// -// Shutdown CoreCLR. It unloads the app domain and stops the CoreCLR host. -// -// Parameters: -// hostHandle - Handle of the host -// domainId - Id of the domain -// latchedExitCode - Latched exit code after domain unloaded -// -// Returns: -// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed -// -CORECLR_HOSTING_API(coreclr_shutdown_2, - void* hostHandle, - unsigned int domainId, - int* latchedExitCode); - -// -// Create a native callable function pointer for a managed method. -// -// Parameters: -// hostHandle - Handle of the host -// domainId - Id of the domain -// entryPointAssemblyName - Name of the assembly which holds the custom entry point -// entryPointTypeName - Name of the type which holds the custom entry point -// entryPointMethodName - Name of the method which is the custom entry point -// delegate - Output parameter, the function stores a native callable function pointer to the delegate at the specified address -// -// Returns: -// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed -// -CORECLR_HOSTING_API(coreclr_create_delegate, - void* hostHandle, - unsigned int domainId, - const char* entryPointAssemblyName, - const char* entryPointTypeName, - const char* entryPointMethodName, - void** delegate); - -// -// Execute a managed assembly with given arguments -// -// Parameters: -// hostHandle - Handle of the host -// domainId - Id of the domain -// argc - Number of arguments passed to the executed assembly -// argv - Array of arguments passed to the executed assembly -// managedAssemblyPath - Path of the managed assembly to execute (or NULL if using a custom entrypoint). -// exitCode - Exit code returned by the executed assembly -// -// Returns: -// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed -// -CORECLR_HOSTING_API(coreclr_execute_assembly, - void* hostHandle, - unsigned int domainId, - int argc, - const char** argv, - const char* managedAssemblyPath, - unsigned int* exitCode); - -#undef CORECLR_HOSTING_API - -#endif // __CORECLR_HOST_H__ \ No newline at end of file diff --git a/src/dnchost/dnchost.cpp b/src/dnchost/dnchost.cpp deleted file mode 100644 index 8ca326fc..00000000 --- a/src/dnchost/dnchost.cpp +++ /dev/null @@ -1,309 +0,0 @@ -// 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. - -#include "precomp.h" - -static DNCSTATE vstate = { }; - - -// internal function declarations - -static HRESULT LoadModulePaths( - __in DNCSTATE* pState - ); -static HRESULT LoadDncConfiguration( - __in DNCSTATE* pState, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs - ); -static HRESULT LoadRuntime( - __in DNCSTATE* pState - ); -static HRESULT LoadManagedBootstrapperApplicationFactory( - __in DNCSTATE* pState - ); -static HRESULT CreatePrerequisiteBA( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in LPCWSTR wzAppBase, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ); - - -// function definitions - -extern "C" BOOL WINAPI DllMain( - IN HINSTANCE hInstance, - IN DWORD dwReason, - IN LPVOID /* pvReserved */ - ) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - ::DisableThreadLibraryCalls(hInstance); - vstate.hInstance = hInstance; - break; - - case DLL_PROCESS_DETACH: - vstate.hInstance = NULL; - break; - } - - return TRUE; -} - -extern "C" HRESULT WINAPI BootstrapperApplicationCreate( - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - HRESULT hrHostInitialization = S_OK; - IBootstrapperEngine* pEngine = NULL; - - // coreclr.dll doesn't support unloading, so the rest of the .NET Core hosting stack doesn't support it either. - // This means we also can't unload. - pResults->fDisableUnloading = TRUE; - - hr = BalInitializeFromCreateArgs(pArgs, &pEngine); - ExitOnFailure(hr, "Failed to initialize Bal."); - - if (!vstate.fInitialized) - { - hr = XmlInitialize(); - BalExitOnFailure(hr, "Failed to initialize XML."); - - hr = LoadModulePaths(&vstate); - BalExitOnFailure(hr, "Failed to get the host base path."); - - hr = LoadDncConfiguration(&vstate, pArgs); - BalExitOnFailure(hr, "Failed to get the dnc configuration."); - - vstate.fInitialized = TRUE; - } - - if (!vstate.fInitializedRuntime) - { - hr = LoadRuntime(&vstate); - - vstate.fInitializedRuntime = SUCCEEDED(hr); - } - - if (vstate.fInitializedRuntime) - { - if (!vstate.pAppFactory) - { - hr = LoadManagedBootstrapperApplicationFactory(&vstate); - BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application factory."); - } - - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading .NET Core %ls bootstrapper application.", DNCHOSTTYPE_FDD == vstate.type ? L"FDD" : L"SCD"); - - hr = vstate.pAppFactory->Create(pArgs, pResults); - BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application."); - } - else // fallback to the prerequisite BA. - { - if (DNCHOSTTYPE_SCD == vstate.type) - { - hrHostInitialization = E_DNCHOST_SCD_RUNTIME_FAILURE; - BalLogError(hr, "The self-contained .NET Core runtime failed to load. This is an unrecoverable error."); - } - else - { - hrHostInitialization = S_OK; - } - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because .NET Core host could not be loaded, error: 0x%08x.", hr); - - hr = CreatePrerequisiteBA(hrHostInitialization, pEngine, vstate.sczAppBase, pArgs, pResults); - BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application."); - } - -LExit: - ReleaseNullObject(pEngine); - - return hr; -} - -extern "C" void WINAPI BootstrapperApplicationDestroy() -{ - if (vstate.hMbapreqModule) - { - PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast(::GetProcAddress(vstate.hMbapreqModule, "DncPrereqBootstrapperApplicationDestroy")); - if (pfnDestroy) - { - (*pfnDestroy)(); - } - - ::FreeLibrary(vstate.hMbapreqModule); - vstate.hMbapreqModule = NULL; - } - - BalUninitialize(); -} - -static HRESULT LoadModulePaths( - __in DNCSTATE* pState - ) -{ - HRESULT hr = S_OK; - - hr = PathForCurrentProcess(&pState->sczModuleFullPath, pState->hInstance); - BalExitOnFailure(hr, "Failed to get the full host path."); - - hr = PathGetDirectory(pState->sczModuleFullPath, &pState->sczAppBase); - BalExitOnFailure(hr, "Failed to get the directory of the full process path."); - - hr = PathConcat(pState->sczAppBase, DNC_ASSEMBLY_FILE_NAME, &pState->sczManagedHostPath); - BalExitOnFailure(hr, "Failed to create managed host path."); - -LExit: - return hr; -} - -static HRESULT LoadDncConfiguration( - __in DNCSTATE* pState, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs - ) -{ - HRESULT hr = S_OK; - IXMLDOMDocument* pixdManifest = NULL; - IXMLDOMNode* pixnHost = NULL; - LPWSTR sczPayloadName = NULL; - DWORD dwBool = 0; - - hr = XmlLoadDocumentFromFile(pArgs->pCommand->wzBootstrapperApplicationDataPath, &pixdManifest); - BalExitOnFailure(hr, "Failed to load BalManifest '%ls'", pArgs->pCommand->wzBootstrapperApplicationDataPath); - - hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBalBAFactoryAssembly", &pixnHost); - BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly element."); - - if (S_FALSE == hr) - { - hr = E_NOTFOUND; - BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config."); - } - - hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName); - BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath."); - - hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath); - BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath."); - - LPCWSTR wzFileName = PathFile(pState->sczBaFactoryAssemblyPath); - LPCWSTR wzExtension = PathExtension(pState->sczBaFactoryAssemblyPath); - if (!wzExtension) - { - BalExitOnFailure(hr = E_FAIL, "BaFactoryAssemblyPath has no extension."); - } - - hr = StrAllocString(&pState->sczBaFactoryAssemblyName, wzFileName, wzExtension - wzFileName); - BalExitOnFailure(hr, "Failed to copy BAFactoryAssembly payload Name."); - - hr = StrAllocString(&pState->sczBaFactoryDepsJsonPath, pState->sczBaFactoryAssemblyPath, wzExtension - pState->sczBaFactoryAssemblyPath); - BalExitOnFailure(hr, "Failed to initialize deps json path."); - - hr = StrAllocString(&pState->sczBaFactoryRuntimeConfigPath, pState->sczBaFactoryDepsJsonPath, 0); - BalExitOnFailure(hr, "Failed to initialize runtime config path."); - - hr = StrAllocConcat(&pState->sczBaFactoryDepsJsonPath, L".deps.json", 0); - BalExitOnFailure(hr, "Failed to concat extension to deps json path."); - - hr = StrAllocConcat(&pState->sczBaFactoryRuntimeConfigPath, L".runtimeconfig.json", 0); - BalExitOnFailure(hr, "Failed to concat extension to runtime config path."); - - pState->type = DNCHOSTTYPE_FDD; - - hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixDncOptions", &pixnHost); - if (S_FALSE == hr) - { - ExitFunction1(hr = S_OK); - } - BalExitOnFailure(hr, "Failed to find WixDncOptions element in bootstrapper application config."); - - hr = XmlGetAttributeNumber(pixnHost, L"SelfContainedDeployment", &dwBool); - if (S_FALSE == hr) - { - hr = S_OK; - } - else if (SUCCEEDED(hr) && dwBool) - { - pState->type = DNCHOSTTYPE_SCD; - } - BalExitOnFailure(hr, "Failed to get SelfContainedDeployment value."); - -LExit: - ReleaseStr(sczPayloadName); - ReleaseObject(pixnHost); - ReleaseObject(pixdManifest); - - return hr; -} - -static HRESULT LoadRuntime( - __in DNCSTATE* pState - ) -{ - HRESULT hr = S_OK; - - hr = DnchostLoadRuntime( - &pState->hostfxrState, - pState->sczModuleFullPath, - pState->sczManagedHostPath, - pState->sczBaFactoryDepsJsonPath, - pState->sczBaFactoryRuntimeConfigPath); - - return hr; -} - -static HRESULT LoadManagedBootstrapperApplicationFactory( - __in DNCSTATE* pState - ) -{ - HRESULT hr = S_OK; - - hr = DnchostCreateFactory( - &pState->hostfxrState, - pState->sczBaFactoryAssemblyName, - pState->sczBaFactoryAssemblyPath, - &pState->pAppFactory); - - return hr; -} - -static HRESULT CreatePrerequisiteBA( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in LPCWSTR wzAppBase, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - LPWSTR sczDncpreqPath = NULL; - HMODULE hModule = NULL; - - hr = PathConcat(wzAppBase, L"dncpreq.dll", &sczDncpreqPath); - BalExitOnFailure(hr, "Failed to get path to pre-requisite BA."); - - hModule = ::LoadLibraryW(sczDncpreqPath); - BalExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL."); - - PFN_DNCPREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast(::GetProcAddress(hModule, "DncPrereqBootstrapperApplicationCreate")); - BalExitOnNullWithLastError(pfnCreate, hr, "Failed to get DncPrereqBootstrapperApplicationCreate entry-point from: %ls", sczDncpreqPath); - - hr = pfnCreate(hrHostInitialization, pEngine, pArgs, pResults); - BalExitOnFailure(hr, "Failed to create prequisite bootstrapper app."); - - vstate.hMbapreqModule = hModule; - hModule = NULL; - -LExit: - if (hModule) - { - ::FreeLibrary(hModule); - } - ReleaseStr(sczDncpreqPath); - - return hr; -} diff --git a/src/dnchost/dnchost.def b/src/dnchost/dnchost.def deleted file mode 100644 index 4488df94..00000000 --- a/src/dnchost/dnchost.def +++ /dev/null @@ -1,6 +0,0 @@ -; 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. - - -EXPORTS - BootstrapperApplicationCreate - BootstrapperApplicationDestroy diff --git a/src/dnchost/dnchost.h b/src/dnchost/dnchost.h deleted file mode 100644 index 22fd8f5e..00000000 --- a/src/dnchost/dnchost.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once -// 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. - - -enum DNCHOSTTYPE -{ - DNCHOSTTYPE_UNKNOWN, - DNCHOSTTYPE_FDD, - DNCHOSTTYPE_SCD, -}; - -extern "C" typedef HRESULT(WINAPI* PFN_DNCPREQ_BOOTSTRAPPER_APPLICATION_CREATE)( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ); - -struct DNCSTATE -{ - BOOL fInitialized; - BOOL fInitializedRuntime; - HINSTANCE hInstance; - LPWSTR sczModuleFullPath; - LPWSTR sczAppBase; - LPWSTR sczManagedHostPath; - LPWSTR sczBaFactoryAssemblyName; - LPWSTR sczBaFactoryAssemblyPath; - LPWSTR sczBaFactoryDepsJsonPath; - LPWSTR sczBaFactoryRuntimeConfigPath; - DNCHOSTTYPE type; - HOSTFXR_STATE hostfxrState; - IBootstrapperApplicationFactory* pAppFactory; - HMODULE hMbapreqModule; -}; diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj deleted file mode 100644 index bef3f77e..00000000 --- a/src/dnchost/dnchost.vcxproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} - DynamicLibrary - v142 - Unicode - dnchost - dnchost.def - - - - - $(Platform) - x86 - ..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\ - shlwapi.lib;$(NetHostPath)libnethost.lib - - - - - - Create - - - - - - - - - - - - - - - - - $(BaseOutputPath)obj;$(NetHostPath);%(AdditionalIncludeDirectories) - - - /LTCG %(AdditionalOptions) - - - - - {0D780900-C2FF-4FA2-8CB5-8A19768724C5} - false - true - - - - - - - - - - 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/dnchost/dncutil.cpp b/src/dnchost/dncutil.cpp deleted file mode 100644 index 34d14911..00000000 --- a/src/dnchost/dncutil.cpp +++ /dev/null @@ -1,411 +0,0 @@ -// 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. - -#include "precomp.h" - -// https://github.com/dotnet/runtime/blob/master/src/installer/corehost/error_codes.h -#define InvalidArgFailure 0x80008081 -#define HostApiBufferTooSmall 0x80008098 -#define HostApiUnsupportedVersion 0x800080a2 - -// internal function declarations - -static HRESULT GetHostfxrPath( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath - ); -static HRESULT LoadHostfxr( - __in HOSTFXR_STATE* pState - ); -static HRESULT InitializeHostfxr( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzManagedHostPath, - __in LPCWSTR wzDepsJsonPath, - __in LPCWSTR wzRuntimeConfigPath - ); -static HRESULT InitializeCoreClr( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath - ); -static HRESULT InitializeCoreClrPre5( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath - ); -static HRESULT LoadCoreClr( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzCoreClrPath - ); -static HRESULT StartCoreClr( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath, - __in DWORD cProperties, - __in LPCWSTR* propertyKeys, - __in LPCWSTR* propertyValues - ); - - -// function definitions - -HRESULT DnchostLoadRuntime( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath, - __in LPCWSTR wzManagedHostPath, - __in LPCWSTR wzDepsJsonPath, - __in LPCWSTR wzRuntimeConfigPath - ) -{ - HRESULT hr = S_OK; - - hr = GetHostfxrPath(pState, wzNativeHostPath); - BalExitOnFailure(hr, "Failed to find hostfxr."); - - hr = LoadHostfxr(pState); - BalExitOnFailure(hr, "Failed to load hostfxr."); - - hr = InitializeHostfxr(pState, wzManagedHostPath, wzDepsJsonPath, wzRuntimeConfigPath); - BalExitOnFailure(hr, "Failed to initialize hostfxr."); - - hr = InitializeCoreClr(pState, wzNativeHostPath); - BalExitOnFailure(hr, "Failed to initialize coreclr."); - -LExit: - return hr; -} - -HRESULT DnchostCreateFactory( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzBaFactoryAssemblyName, - __in LPCWSTR wzBaFactoryAssemblyPath, - __out IBootstrapperApplicationFactory** ppAppFactory - ) -{ - HRESULT hr = S_OK; - PFNCREATEBAFACTORY pfnCreateBAFactory = NULL; - - if (pState->pfnGetFunctionPointer) - { - hr = pState->pfnGetFunctionPointer( - DNC_ENTRY_TYPEW, - DNC_STATIC_ENTRY_METHODW, - DNC_STATIC_ENTRY_DELEGATEW, - NULL, - NULL, - reinterpret_cast(&pfnCreateBAFactory)); - BalExitOnFailure(hr, "Failed to create delegate through GetFunctionPointer."); - } - else - { - hr = pState->pfnCoreclrCreateDelegate( - pState->pClrHandle, - pState->dwDomainId, - DNC_ASSEMBLY_FULL_NAME, - DNC_ENTRY_TYPE, - DNC_STATIC_ENTRY_METHOD, - reinterpret_cast(&pfnCreateBAFactory)); - BalExitOnFailure(hr, "Failed to create delegate in app domain."); - } - - *ppAppFactory = pfnCreateBAFactory(wzBaFactoryAssemblyName, wzBaFactoryAssemblyPath); - -LExit: - return hr; -} - -static HRESULT GetHostfxrPath( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath - ) -{ - HRESULT hr = S_OK; - get_hostfxr_parameters getHostfxrParameters = { }; - int nrc = 0; - size_t cchHostFxrPath = MAX_PATH; - - getHostfxrParameters.size = sizeof(get_hostfxr_parameters); - getHostfxrParameters.assembly_path = wzNativeHostPath; - - // get_hostfxr_path does a full search on every call, so - // minimize the number of calls - // need to loop - for (;;) - { - cchHostFxrPath *= 2; - hr = StrAlloc(&pState->sczHostfxrPath, cchHostFxrPath); - BalExitOnFailure(hr, "Failed to allocate hostFxrPath."); - - nrc = get_hostfxr_path(pState->sczHostfxrPath, &cchHostFxrPath, &getHostfxrParameters); - if (HostApiBufferTooSmall != nrc) - { - break; - } - } - if (0 != nrc) - { - BalExitOnFailure(hr = nrc, "GetHostfxrPath failed"); - } - -LExit: - return hr; -} - -static HRESULT LoadHostfxr( - __in HOSTFXR_STATE* pState - ) -{ - HRESULT hr = S_OK; - HMODULE hHostfxr; - - hHostfxr = ::LoadLibraryExW(pState->sczHostfxrPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - BalExitOnNullWithLastError(hHostfxr, hr, "Failed to load hostfxr from '%ls'.", pState->sczHostfxrPath); - - pState->pfnHostfxrInitializeForApp = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_initialize_for_dotnet_command_line")); - BalExitOnNullWithLastError(pState->pfnHostfxrInitializeForApp, hr, "Failed to get procedure address for hostfxr_initialize_for_dotnet_command_line."); - - pState->pfnHostfxrGetRuntimeProperties = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_get_runtime_properties")); - BalExitOnNullWithLastError(pState->pfnHostfxrGetRuntimeProperties, hr, "Failed to get procedure address for hostfxr_get_runtime_properties."); - - pState->pfnHostfxrSetErrorWriter = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_set_error_writer")); - BalExitOnNullWithLastError(pState->pfnHostfxrSetErrorWriter, hr, "Failed to get procedure address for hostfxr_set_error_writer."); - - pState->pfnHostfxrClose = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_close")); - BalExitOnNullWithLastError(pState->pfnHostfxrClose, hr, "Failed to get procedure address for hostfxr_close."); - - pState->pfnHostfxrGetRuntimeDelegate = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_get_runtime_delegate")); - BalExitOnNullWithLastError(pState->pfnHostfxrGetRuntimeDelegate, hr, "Failed to get procedure address for hostfxr_get_runtime_delegate."); - -LExit: - // Never unload the module since it isn't meant to be unloaded. - - return hr; -} - -static void HOSTFXR_CALLTYPE DnchostErrorWriter( - __in LPCWSTR wzMessage - ) -{ - BOOTSTRAPPER_LOG_LEVEL level = BOOTSTRAPPER_LOG_LEVEL_ERROR; - - if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, 0, wzMessage, -1, L"The requested delegate type is not available in the target framework.", -1)) - { - level = BOOTSTRAPPER_LOG_LEVEL_DEBUG; - } - - BalLog(level, "error from hostfxr: %ls", wzMessage); -} - -static HRESULT InitializeHostfxr( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzManagedHostPath, - __in LPCWSTR wzDepsJsonPath, - __in LPCWSTR wzRuntimeConfigPath - ) -{ - HRESULT hr = S_OK; - - pState->pfnHostfxrSetErrorWriter(static_cast(&DnchostErrorWriter)); - - LPCWSTR argv[] = { - L"exec", - L"--depsfile", - wzDepsJsonPath, - L"--runtimeconfig", - wzRuntimeConfigPath, - wzManagedHostPath, - }; - hr = pState->pfnHostfxrInitializeForApp(sizeof(argv)/sizeof(LPWSTR), argv, NULL, &pState->hostContextHandle); - BalExitOnFailure(hr, "HostfxrInitializeForApp failed"); - -LExit: - return hr; -} - -static HRESULT InitializeCoreClr( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath - ) -{ - HRESULT hr = S_OK; - - hr = pState->pfnHostfxrGetRuntimeDelegate(pState->hostContextHandle, hdt_get_function_pointer, reinterpret_cast(&pState->pfnGetFunctionPointer)); - if (InvalidArgFailure == hr || // old versions of hostfxr don't allow calling GetRuntimeDelegate from InitializeForApp. - HostApiUnsupportedVersion == hr) // hdt_get_function_pointer was added in .NET 5. - { - hr = InitializeCoreClrPre5(pState, wzNativeHostPath); - } - else - { - ExitOnFailure(hr, "HostfxrGetRuntimeDelegate failed"); - } - -LExit: - return hr; -} - -static HRESULT InitializeCoreClrPre5( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath - ) -{ - HRESULT hr = S_OK; - int32_t rc = 0; - LPCWSTR* rgPropertyKeys = NULL; - LPCWSTR* rgPropertyValues = NULL; - size_t cProperties = 0; - LPWSTR* rgDirectories = NULL; - UINT cDirectories = 0; - LPWSTR sczCoreClrPath = NULL; - - // We are not using hostfxr as it was intended to be used. We need to initialize hostfxr so that it properly initializes hostpolicy - - // there are pieces of the framework such as AssemblyDependencyResolver that won't work without that. We also need hostfxr to find a - // compatible framework for framework-dependent deployed BAs. We had to use hostfxr_initialize_for_dotnet_command_line since - // hostfxr_initialize_for_runtime_config doesn't currently (3.x) support self-contained deployed BAs. That means we're supposed to - // start the runtime through hostfxr_run_app, but that method shuts down the runtime before returning. We actually want to call - // hostfxr_get_runtime_delegate, but that method currently requires hostfxr to be initialized through - // hostfxr_initialize_for_runtime_config. So we're forced to locate coreclr.dll and manually load the runtime ourselves. - - // Unfortunately, that's not the only problem. hostfxr has global state that tracks whether it started the runtime. While we keep our - // hostfxr_handle open, everyone that calls the hostfxr_initialize_* methods will block until we have started the runtime through - // hostfxr or closed our handle. If we close the handle, then hostfxr could potentially try to load a second runtime into the - // process, which is not supported. We're going to just keep our handle open since no one else in the process should be trying to - // start the runtime anyway. - - rc = pState->pfnHostfxrGetRuntimeProperties(pState->hostContextHandle, &cProperties, rgPropertyKeys, rgPropertyValues); - if (HostApiBufferTooSmall != rc) - { - BalExitOnFailure(hr = rc, "HostfxrGetRuntimeProperties failed to return required size."); - } - - rgPropertyKeys = static_cast(MemAlloc(sizeof(LPWSTR) * cProperties, TRUE)); - rgPropertyValues = static_cast(MemAlloc(sizeof(LPWSTR) * cProperties, TRUE)); - if (!rgPropertyKeys || !rgPropertyValues) - { - BalExitOnFailure(hr = E_OUTOFMEMORY, "Failed to allocate buffers for runtime properties."); - } - - hr = pState->pfnHostfxrGetRuntimeProperties(pState->hostContextHandle, &cProperties, rgPropertyKeys, rgPropertyValues); - BalExitOnFailure(hr, "HostfxrGetRuntimeProperties failed."); - - for (DWORD i = 0; i < cProperties; ++i) - { - if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, 0, rgPropertyKeys[i], -1, L"NATIVE_DLL_SEARCH_DIRECTORIES", -1)) - { - hr = StrSplitAllocArray(&rgDirectories, &cDirectories, rgPropertyValues[i], L";"); - BalExitOnFailure(hr, "Failed to split NATIVE_DLL_SEARCH_DIRECTORIES '%ls'", rgPropertyValues[i]); - } - } - - for (DWORD i = 0; i < cDirectories; ++i) - { - hr = PathConcat(rgDirectories[i], L"coreclr.dll", &sczCoreClrPath); - BalExitOnFailure(hr, "Failed to allocate path to coreclr."); - - if (::PathFileExists(sczCoreClrPath)) - { - break; - } - else - { - ReleaseNullStr(sczCoreClrPath); - } - } - - if (!sczCoreClrPath) - { - for (DWORD i = 0; i < cProperties; ++i) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "%ls: %ls", rgPropertyKeys[i], rgPropertyValues[i]); - } - BalExitOnFailure(hr = E_FILENOTFOUND, "Failed to locate coreclr.dll."); - } - - hr = LoadCoreClr(pState, sczCoreClrPath); - BalExitOnFailure(hr, "Failed to load coreclr."); - - hr = StartCoreClr(pState, wzNativeHostPath, (DWORD)cProperties, rgPropertyKeys, rgPropertyValues); - BalExitOnFailure(hr, "Failed to start coreclr."); - -LExit: - MemFree(rgDirectories); - MemFree(rgPropertyValues); - MemFree(rgPropertyKeys); - ReleaseStr(sczCoreClrPath); - - return hr; -} - -static HRESULT LoadCoreClr( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzCoreClrPath - ) -{ - HRESULT hr = S_OK; - HMODULE hModule = NULL; - - hModule = ::LoadLibraryExW(wzCoreClrPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - BalExitOnNullWithLastError(hModule, hr, "Failed to load coreclr.dll from '%ls'.", wzCoreClrPath); - - pState->pfnCoreclrInitialize = reinterpret_cast(::GetProcAddress(hModule, "coreclr_initialize")); - BalExitOnNullWithLastError(pState->pfnCoreclrInitialize, hr, "Failed to get procedure address for coreclr_initialize."); - - pState->pfnCoreclrCreateDelegate = reinterpret_cast(::GetProcAddress(hModule, "coreclr_create_delegate")); - BalExitOnNullWithLastError(pState->pfnCoreclrCreateDelegate, hr, "Failed to get procedure address for coreclr_create_delegate."); - -LExit: - // Never unload the module since coreclr doesn't support it. - - return hr; -} - -static HRESULT StartCoreClr( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath, - __in DWORD cProperties, - __in LPCWSTR* propertyKeys, - __in LPCWSTR* propertyValues - ) -{ - HRESULT hr = S_OK; - LPSTR szNativeHostPath = NULL; - LPSTR* rgPropertyKeys = NULL; - LPSTR* rgPropertyValues = NULL; - - rgPropertyKeys = static_cast(MemAlloc(sizeof(LPSTR) * cProperties, TRUE)); - rgPropertyValues = static_cast(MemAlloc(sizeof(LPSTR) * cProperties, TRUE)); - if (!rgPropertyKeys || !rgPropertyValues) - { - BalExitOnFailure(hr = E_OUTOFMEMORY, "Failed to allocate buffers for runtime properties."); - } - - hr = StrAnsiAllocString(&szNativeHostPath, wzNativeHostPath, 0, CP_UTF8); - BalExitOnFailure(hr, "Failed to convert module path to UTF8: %ls", wzNativeHostPath); - - for (DWORD i = 0; i < cProperties; ++i) - { - hr = StrAnsiAllocString(&rgPropertyKeys[i], propertyKeys[i], 0, CP_UTF8); - BalExitOnFailure(hr, "Failed to convert property key to UTF8: %ls", propertyKeys[i]); - - hr = StrAnsiAllocString(&rgPropertyValues[i], propertyValues[i], 0, CP_UTF8); - BalExitOnFailure(hr, "Failed to convert property value to UTF8: %ls", propertyValues[i]); - } - - hr = pState->pfnCoreclrInitialize(szNativeHostPath, "MBA", cProperties, (LPCSTR*)rgPropertyKeys, (LPCSTR*)rgPropertyValues, &pState->pClrHandle, &pState->dwDomainId); - BalExitOnFailure(hr, "CoreclrInitialize failed."); - -LExit: - for (DWORD i = 0; i < cProperties; ++i) - { - if (rgPropertyKeys) - { - ReleaseStr(rgPropertyKeys[i]); - } - - if (rgPropertyValues) - { - ReleaseStr(rgPropertyValues[i]); - } - } - ReleaseMem(rgPropertyValues); - ReleaseMem(rgPropertyKeys); - ReleaseStr(szNativeHostPath); - - return hr; -} diff --git a/src/dnchost/dncutil.h b/src/dnchost/dncutil.h deleted file mode 100644 index 85eda3b2..00000000 --- a/src/dnchost/dncutil.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once -// 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. - -typedef IBootstrapperApplicationFactory* (STDMETHODCALLTYPE* PFNCREATEBAFACTORY)( - __in LPCWSTR wzBaFactoryAssemblyName, - __in LPCWSTR wzBaFactoryAssemblyPath - ); - -struct HOSTFXR_STATE -{ - LPWSTR sczHostfxrPath; - hostfxr_handle hostContextHandle; - hostfxr_initialize_for_dotnet_command_line_fn pfnHostfxrInitializeForApp; - hostfxr_get_runtime_properties_fn pfnHostfxrGetRuntimeProperties; - hostfxr_set_error_writer_fn pfnHostfxrSetErrorWriter; - hostfxr_close_fn pfnHostfxrClose; - hostfxr_get_runtime_delegate_fn pfnHostfxrGetRuntimeDelegate; - get_function_pointer_fn pfnGetFunctionPointer; - coreclr_initialize_ptr pfnCoreclrInitialize; - coreclr_create_delegate_ptr pfnCoreclrCreateDelegate; - void* pClrHandle; - UINT dwDomainId; -}; - -HRESULT DnchostLoadRuntime( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzNativeHostPath, - __in LPCWSTR wzManagedHostPath, - __in LPCWSTR wzDepsJsonPath, - __in LPCWSTR wzRuntimeConfigPath - ); - -HRESULT DnchostCreateFactory( - __in HOSTFXR_STATE* pState, - __in LPCWSTR wzBaFactoryAssemblyName, - __in LPCWSTR wzBaFactoryAssemblyPath, - __out IBootstrapperApplicationFactory** ppAppFactory - ); diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config deleted file mode 100644 index 6c369364..00000000 --- a/src/dnchost/packages.config +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/dnchost/precomp.cpp b/src/dnchost/precomp.cpp deleted file mode 100644 index 37664a1c..00000000 --- a/src/dnchost/precomp.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// 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. - -#include "precomp.h" diff --git a/src/dnchost/precomp.h b/src/dnchost/precomp.h deleted file mode 100644 index 84ff6424..00000000 --- a/src/dnchost/precomp.h +++ /dev/null @@ -1,31 +0,0 @@ -#pragma once -// 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. - -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -#include -#include - -#include -#include -#include -#include - -#include -#define NETHOST_USE_AS_STATIC -#include -#include -#include - -#include "coreclrhost.h" -#include "dncutil.h" -#include "dnchost.h" diff --git a/src/ext/Bal/Bal.wixext.sln b/src/ext/Bal/Bal.wixext.sln new file mode 100644 index 00000000..0b4c5afa --- /dev/null +++ b/src/ext/Bal/Bal.wixext.sln @@ -0,0 +1,319 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29503.13 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{C70E3534-A018-4D0A-A340-916C9777EEF7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bafunctions", "src\Samples\bafunctions\bafunctions.vcxproj", "{EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mbahost", "src\mbahost\mbahost.vcxproj", "{12C87C77-3547-44F8-8134-29BC915CB19D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wixstdba", "src\wixstdba\wixstdba.vcxproj", "{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}" +EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "bal", "src\wixlib\bal.wixproj", "{3444D952-F21C-496F-AB6B-56435BFD0787}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Bal.wixext", "src\wixext\WixToolset.Bal.wixext.csproj", "{BF720A63-9D7B-456E-B60C-8122852D9FED}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolset.Dnc.Host", "src\WixToolset.Dnc.Host\WixToolset.Dnc.Host.csproj", "{0D780900-C2FF-4FA2-8CB5-8A19768724C5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WixToolset.Mba.Host", "src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj", "{F2BA1935-70FA-4156-B161-FD03850B4FAA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework2MBA", "src\test\examples\FullFramework2MBA\Example.FullFramework2MBA.csproj", "{CC4236FC-226E-4232-AB50-24CBEC4D314D}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Example.TestEngine", "src\test\examples\TestEngine\Example.TestEngine.vcxproj", "{3D44B67D-A475-49BA-8310-E39F6C117CC9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.ManagedHost", "src\test\WixToolsetTest.ManagedHost\WixToolsetTest.ManagedHost.csproj", "{FED9D707-E5C3-4867-87B0-FABDB5EB0823}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.FullFramework4MBA", "src\test\examples\FullFramework4MBA\Example.FullFramework4MBA.csproj", "{44297646-706D-4508-8E96-1B35B109694C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WixToolsetTest.Bal", "src\test\WixToolsetTest.Bal\WixToolsetTest.Bal.csproj", "{89D479FC-20DA-44D8-AE38-48F063223498}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.EarliestCoreMBA", "src\test\examples\EarliestCoreMBA\Example.EarliestCoreMBA.csproj", "{1E86D8DF-DABD-4B6E-A812-64CD2040C73A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dnchost", "src\dnchost\dnchost.vcxproj", "{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.LatestCoreMBA", "src\test\examples\LatestCoreMBA\Example.LatestCoreMBA.csproj", "{A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example.WPFCoreMBA", "src\test\examples\WPFCoreMBA\Example.WPFCoreMBA.csproj", "{8E707BF2-FD72-4649-8727-BA5955D48D40}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|ARM64 = Debug|ARM64 + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|ARM64 = Release|ARM64 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|Any CPU.Build.0 = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|ARM64.Build.0 = Debug|ARM64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x64.ActiveCfg = Debug|x64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x64.Build.0 = Debug|x64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.ActiveCfg = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Debug|x86.Build.0 = Debug|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.ActiveCfg = Release|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|Any CPU.Build.0 = Release|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|ARM64.ActiveCfg = Release|ARM64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|ARM64.Build.0 = Release|ARM64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.ActiveCfg = Release|x64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x64.Build.0 = Release|x64 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.ActiveCfg = Release|Win32 + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02}.Release|x86.Build.0 = Release|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|Any CPU.Build.0 = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|ARM64.Build.0 = Debug|ARM64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.ActiveCfg = Debug|x64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x64.Build.0 = Debug|x64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.ActiveCfg = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Debug|x86.Build.0 = Debug|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.ActiveCfg = Release|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|Any CPU.Build.0 = Release|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|ARM64.ActiveCfg = Release|ARM64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|ARM64.Build.0 = Release|ARM64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.ActiveCfg = Release|x64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x64.Build.0 = Release|x64 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.ActiveCfg = Release|Win32 + {12C87C77-3547-44F8-8134-29BC915CB19D}.Release|x86.Build.0 = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|Any CPU.Build.0 = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|ARM64.Build.0 = Debug|ARM64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x64.ActiveCfg = Debug|x64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x64.Build.0 = Debug|x64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.ActiveCfg = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Debug|x86.Build.0 = Debug|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.ActiveCfg = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|Any CPU.Build.0 = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|ARM64.ActiveCfg = Release|ARM64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|ARM64.Build.0 = Release|ARM64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x64.ActiveCfg = Release|x64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x64.Build.0 = Release|x64 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.ActiveCfg = Release|Win32 + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}.Release|x86.Build.0 = Release|Win32 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.ActiveCfg = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|Any CPU.Build.0 = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|ARM64.ActiveCfg = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x64.ActiveCfg = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.ActiveCfg = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Debug|x86.Build.0 = Debug|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.ActiveCfg = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|Any CPU.Build.0 = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|ARM64.ActiveCfg = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x64.ActiveCfg = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.ActiveCfg = Release|x86 + {3444D952-F21C-496F-AB6B-56435BFD0787}.Release|x86.Build.0 = Release|x86 + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|ARM64.Build.0 = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.ActiveCfg = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x64.Build.0 = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.ActiveCfg = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Debug|x86.Build.0 = Debug|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|Any CPU.Build.0 = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|ARM64.ActiveCfg = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|ARM64.Build.0 = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.ActiveCfg = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x64.Build.0 = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.ActiveCfg = Release|Any CPU + {BF720A63-9D7B-456E-B60C-8122852D9FED}.Release|x86.Build.0 = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|ARM64.Build.0 = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x64.ActiveCfg = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x64.Build.0 = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x86.ActiveCfg = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Debug|x86.Build.0 = Debug|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|Any CPU.Build.0 = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|ARM64.ActiveCfg = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|ARM64.Build.0 = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x64.ActiveCfg = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x64.Build.0 = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x86.ActiveCfg = Release|Any CPU + {0D780900-C2FF-4FA2-8CB5-8A19768724C5}.Release|x86.Build.0 = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|ARM64.Build.0 = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.ActiveCfg = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x64.Build.0 = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.ActiveCfg = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Debug|x86.Build.0 = Debug|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|Any CPU.Build.0 = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|ARM64.ActiveCfg = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|ARM64.Build.0 = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.ActiveCfg = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x64.Build.0 = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.ActiveCfg = Release|Any CPU + {F2BA1935-70FA-4156-B161-FD03850B4FAA}.Release|x86.Build.0 = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|ARM64.Build.0 = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.ActiveCfg = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x64.Build.0 = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.ActiveCfg = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Debug|x86.Build.0 = Debug|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|Any CPU.Build.0 = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|ARM64.ActiveCfg = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|ARM64.Build.0 = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.ActiveCfg = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x64.Build.0 = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.ActiveCfg = Release|Any CPU + {CC4236FC-226E-4232-AB50-24CBEC4D314D}.Release|x86.Build.0 = Release|Any CPU + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|Any CPU.Build.0 = Debug|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|ARM64.Build.0 = Debug|ARM64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.ActiveCfg = Debug|x64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x64.Build.0 = Debug|x64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.ActiveCfg = Debug|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Debug|x86.Build.0 = Debug|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.ActiveCfg = Release|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|Any CPU.Build.0 = Release|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.ActiveCfg = Release|ARM64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|ARM64.Build.0 = Release|ARM64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.ActiveCfg = Release|x64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x64.Build.0 = Release|x64 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.ActiveCfg = Release|Win32 + {3D44B67D-A475-49BA-8310-E39F6C117CC9}.Release|x86.Build.0 = Release|Win32 + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|ARM64.Build.0 = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.ActiveCfg = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x64.Build.0 = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.ActiveCfg = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Debug|x86.Build.0 = Debug|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|Any CPU.Build.0 = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|ARM64.ActiveCfg = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|ARM64.Build.0 = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.ActiveCfg = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x64.Build.0 = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.ActiveCfg = Release|Any CPU + {FED9D707-E5C3-4867-87B0-FABDB5EB0823}.Release|x86.Build.0 = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|ARM64.Build.0 = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.ActiveCfg = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|x64.Build.0 = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.ActiveCfg = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Debug|x86.Build.0 = Debug|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|Any CPU.Build.0 = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|ARM64.ActiveCfg = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|ARM64.Build.0 = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.ActiveCfg = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|x64.Build.0 = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.ActiveCfg = Release|Any CPU + {44297646-706D-4508-8E96-1B35B109694C}.Release|x86.Build.0 = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|Any CPU.Build.0 = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|ARM64.Build.0 = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x64.ActiveCfg = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x64.Build.0 = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x86.ActiveCfg = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Debug|x86.Build.0 = Debug|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|Any CPU.ActiveCfg = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|Any CPU.Build.0 = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|ARM64.ActiveCfg = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|ARM64.Build.0 = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.ActiveCfg = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x64.Build.0 = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.ActiveCfg = Release|Any CPU + {89D479FC-20DA-44D8-AE38-48F063223498}.Release|x86.Build.0 = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|ARM64.Build.0 = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.ActiveCfg = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x64.Build.0 = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.ActiveCfg = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Debug|x86.Build.0 = Debug|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|Any CPU.Build.0 = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|ARM64.ActiveCfg = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|ARM64.Build.0 = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.ActiveCfg = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x64.Build.0 = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.ActiveCfg = Release|Any CPU + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A}.Release|x86.Build.0 = Release|Any CPU + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|Any CPU.Build.0 = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|ARM64.Build.0 = Debug|ARM64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.ActiveCfg = Debug|x64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x64.Build.0 = Debug|x64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.ActiveCfg = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Debug|x86.Build.0 = Debug|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.ActiveCfg = Release|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|Any CPU.Build.0 = Release|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|ARM64.ActiveCfg = Release|ARM64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|ARM64.Build.0 = Release|ARM64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.ActiveCfg = Release|x64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x64.Build.0 = Release|x64 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.ActiveCfg = Release|Win32 + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2}.Release|x86.Build.0 = Release|Win32 + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|ARM64.Build.0 = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.ActiveCfg = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x64.Build.0 = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.ActiveCfg = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Debug|x86.Build.0 = Debug|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|Any CPU.Build.0 = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|ARM64.ActiveCfg = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|ARM64.Build.0 = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.ActiveCfg = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x64.Build.0 = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.ActiveCfg = Release|Any CPU + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618}.Release|x86.Build.0 = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|ARM64.Build.0 = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.ActiveCfg = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x64.Build.0 = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.ActiveCfg = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Debug|x86.Build.0 = Debug|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|Any CPU.Build.0 = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|ARM64.ActiveCfg = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|ARM64.Build.0 = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.ActiveCfg = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x64.Build.0 = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x86.ActiveCfg = Release|Any CPU + {8E707BF2-FD72-4649-8727-BA5955D48D40}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {CC4236FC-226E-4232-AB50-24CBEC4D314D} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {3D44B67D-A475-49BA-8310-E39F6C117CC9} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {44297646-706D-4508-8E96-1B35B109694C} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {1E86D8DF-DABD-4B6E-A812-64CD2040C73A} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {A4247D9D-3CC9-4BE1-B23A-BEC166AF3618} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + {8E707BF2-FD72-4649-8727-BA5955D48D40} = {C70E3534-A018-4D0A-A340-916C9777EEF7} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {74046961-48BF-467A-A6C2-F886C75CE0BE} + EndGlobalSection +EndGlobal diff --git a/src/ext/Bal/CSharp.Build.props b/src/ext/Bal/CSharp.Build.props new file mode 100644 index 00000000..81d24ad1 --- /dev/null +++ b/src/ext/Bal/CSharp.Build.props @@ -0,0 +1,13 @@ + + + + + true + true + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)wix.snk)) + false + + diff --git a/src/ext/Bal/Cpp.Build.props b/src/ext/Bal/Cpp.Build.props new file mode 100644 index 00000000..e7bba117 --- /dev/null +++ b/src/ext/Bal/Cpp.Build.props @@ -0,0 +1,94 @@ + + + + + + Win32 + $(BaseIntermediateOutputPath)$(Configuration)\$(Platform)\ + $(OutputPath)$(Platform)\ + + + $(Company) + $(Copyright) + + + + $([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0')) + + + + $(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset + + + + + $(DisableSpecificCompilerWarnings) + Level4 + $(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories) + WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions) + Use + precomp.h + StdCall + true + false + -YlprecompDefine + /Zc:threadSafeInit- %(AdditionalOptions) + true + + + $(ArmPreprocessorDefinitions);%(PreprocessorDefinitions) + $(ProjectAdditionalResourceIncludeDirectories);%(AdditionalIncludeDirectories) + + + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ProjectAdditionalLibraryDirectories);%(AdditionalLibraryDirectories) + + + $(ProjectSubSystem) + $(ProjectModuleDefinitionFile) + $(ResourceOnlyDll) + true + $(ProjectAdditionalLinkLibraries);advapi32.lib;comdlg32.lib;user32.lib;oleaut32.lib;gdi32.lib;shell32.lib;ole32.lib;version.lib;%(AdditionalDependencies) + $(OutDir);$(AdditionalMultiTargetLibraryPath);$(ArmLibraryDirectories);$(ProjectAdditionalLinkLibraryDirectories);%(AdditionalLibraryDirectories) + /IGNORE:4099 %(AdditionalOptions) + + + + + + NoExtensions + + + + + CDecl + + + + + OldStyle + true + true + + + + + Disabled + EnableFastChecks + _DEBUG;DEBUG;%(PreprocessorDefinitions) + MultiThreadedDebug + + + + + MinSpace + NDEBUG;%(PreprocessorDefinitions) + true + true + MultiThreaded + + + true + true + + + diff --git a/src/ext/Bal/Custom.Build.props b/src/ext/Bal/Custom.Build.props new file mode 100644 index 00000000..66e74d81 --- /dev/null +++ b/src/ext/Bal/Custom.Build.props @@ -0,0 +1,11 @@ + + + + + + $(OutputPath)examples\$(ProjectName)\ + + + $(OutDir)examples\$(ProjectName)\ + + diff --git a/src/ext/Bal/CustomizedNativeRecommendedRules.ruleset b/src/ext/Bal/CustomizedNativeRecommendedRules.ruleset new file mode 100644 index 00000000..142b141c --- /dev/null +++ b/src/ext/Bal/CustomizedNativeRecommendedRules.ruleset @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/Directory.Build.props b/src/ext/Bal/Directory.Build.props new file mode 100644 index 00000000..f83cc154 --- /dev/null +++ b/src/ext/Bal/Directory.Build.props @@ -0,0 +1,29 @@ + + + + + + Debug + false + MSB3246 + + $(MSBuildProjectName) + $([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\)) + $(BaseOutputPath)obj\$(ProjectName)\ + $(BaseOutputPath)$(Configuration)\ + + WiX Toolset Team + WiX Toolset + Copyright (c) .NET Foundation and contributors. All rights reserved. + MS-RL + WiX Toolset + + + + + + + diff --git a/src/ext/Bal/Directory.Build.targets b/src/ext/Bal/Directory.Build.targets new file mode 100644 index 00000000..cb988931 --- /dev/null +++ b/src/ext/Bal/Directory.Build.targets @@ -0,0 +1,56 @@ + + + + + + + false + $(OutputPath)\$(AssemblyName).xml + + + + true + $(SolutionPath) + $(NCrunchOriginalSolutionPath) + + + + + + + $([System.IO.File]::ReadAllText($(TheSolutionPath))) + $([System.IO.Path]::GetDirectoryName( $(TheSolutionPath) )) + (?<="[PackageName]", ")(.*)(?=", ") + + + + + + %(Identity) + $(SolutionFileContent.Contains('\%(Identity).csproj')) + + + + + $(RegexPattern.Replace('[PackageName]','%(PackageName)') ) + $([System.Text.RegularExpressions.Regex]::Match('$(SolutionFileContent)', '%(Pattern)')) + + + + + + + + + + + + + + diff --git a/src/ext/Bal/README.md b/src/ext/Bal/README.md new file mode 100644 index 00000000..cc5d9b34 --- /dev/null +++ b/src/ext/Bal/README.md @@ -0,0 +1,2 @@ +# Bal.wixext +WixToolset.Bal.wixext - Bootstrapper Application Layer WiX Toolset Extension diff --git a/src/ext/Bal/Samples/bafunctions/Readme.txt b/src/ext/Bal/Samples/bafunctions/Readme.txt new file mode 100644 index 00000000..517d0d4c --- /dev/null +++ b/src/ext/Bal/Samples/bafunctions/Readme.txt @@ -0,0 +1,85 @@ + +This is a sample project showing how to create a BA function assembly. + +The four interfaces are in the WixSampleBAFunctions.cpp file. + + +Example code: +~~~~~~~~~~~~~ + + + HRESULT hr = S_OK; + HKEY hkKey = NULL; + LPWSTR sczValue = NULL; + LPWSTR sczFormatedValue = NULL; + + + //--------------------------------------------------------------------------------------------- + // Example of BA function failure + hr = E_NOTIMPL; + BalExitOnFailure(hr, "Test failure."); + //--------------------------------------------------------------------------------------------- + + //--------------------------------------------------------------------------------------------- + // Example of setting a variables + hr = m_pEngine->SetVariableString(L"Variable1", L"String value"); + BalExitOnFailure(hr, "Failed to set variable."); + hr = m_pEngine->SetVariableNumeric(L"Variable2", 1234); + BalExitOnFailure(hr, "Failed to set variable."); + //--------------------------------------------------------------------------------------------- + + //--------------------------------------------------------------------------------------------- + // Example of reading burn variable. + BalGetStringVariable(L"WixBundleName", &sczValue); + BalExitOnFailure(hr, "Failed to get variable."); + + hr = m_pEngine->SetVariableString(L"Variable4", sczValue); + BalExitOnFailure(hr, "Failed to set variable."); + //--------------------------------------------------------------------------------------------- + + ReleaseNullStr(sczValue); // Release string so it can be re-used + + //--------------------------------------------------------------------------------------------- + // Examples of reading burn variable and formatting it. + BalGetStringVariable(L"InstallFolder", &sczValue); + BalExitOnFailure(hr, "Failed to get variable."); + + hr = m_pEngine->SetVariableString(L"Variable5", sczValue); + BalExitOnFailure(hr, "Failed to set variable."); + + BalFormatString(sczValue, &sczFormatedValue); + BalExitOnFailure(hr, "Failed to format variable."); + + hr = m_pEngine->SetVariableString(L"Variable6", sczFormatedValue); + BalExitOnFailure(hr, "Failed to set variable."); + //--------------------------------------------------------------------------------------------- + + ReleaseNullStr(sczValue); // Release string so it can be re-used + + //--------------------------------------------------------------------------------------------- + // Example of reading 64 bit registry and setting the InstallFolder variable to the value read. + hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v3.5", KEY_READ | KEY_WOW64_64KEY, &hkKey); + BalExitOnFailure(hr, "Failed to open registry key."); + + hr = RegReadString(hkKey, L"InstallPath", &sczValue); + BalExitOnFailure(hr, "Failed to read registry value."); + + // Example of function call + PathBackslashTerminate(&sczValue); + + hr = m_pEngine->SetVariableString(L"InstallFolder", sczValue); + BalExitOnFailure(hr, "Failed to set variable."); + //--------------------------------------------------------------------------------------------- + + ReleaseNullStr(sczValue); // Release string so it can be re-used + + //--------------------------------------------------------------------------------------------- + // Example of calling a function that return HRESULT + hr = GetFileVersion(); + BalExitOnFailure(hr, "Failed to get version."); + //--------------------------------------------------------------------------------------------- + + LExit: + ReleaseRegKey(hkKey); + ReleaseStr(sczValue); + ReleaseStr(sczFormatedValue); diff --git a/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp new file mode 100644 index 00000000..531b86a3 --- /dev/null +++ b/src/ext/Bal/Samples/bafunctions/WixSampleBAFunctions.cpp @@ -0,0 +1,95 @@ +// 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. + +#include "precomp.h" +#include "BalBaseBAFunctions.h" +#include "BalBaseBAFunctionsProc.h" + +class CWixSampleBAFunctions : public CBalBaseBAFunctions +{ +public: // IBootstrapperApplication + virtual STDMETHODIMP OnDetectBegin( + __in BOOL fInstalled, + __in DWORD cPackages, + __inout BOOL* pfCancel + ) + { + HRESULT hr = S_OK; + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Running detect begin BA function. fInstalled=%d, cPackages=%u, fCancel=%d", fInstalled, cPackages, *pfCancel); + + //------------------------------------------------------------------------------------------------- + // YOUR CODE GOES HERE + BalExitOnFailure(hr, "Change this message to represent real error handling."); + //------------------------------------------------------------------------------------------------- + + LExit: + return hr; + } + +public: // IBAFunctions + virtual STDMETHODIMP OnPlanBegin( + __in DWORD cPackages, + __inout BOOL* pfCancel + ) + { + HRESULT hr = S_OK; + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Running plan begin BA function. cPackages=%u, fCancel=%d", cPackages, *pfCancel); + + //------------------------------------------------------------------------------------------------- + // YOUR CODE GOES HERE + BalExitOnFailure(hr, "Change this message to represent real error handling."); + //------------------------------------------------------------------------------------------------- + + LExit: + return hr; + } + +public: + // + // Constructor - initialize member variables. + // + CWixSampleBAFunctions( + __in HMODULE hModule, + __in IBootstrapperEngine* pEngine, + __in const BA_FUNCTIONS_CREATE_ARGS* pArgs + ) : CBalBaseBAFunctions(hModule, pEngine, pArgs) + { + } + + // + // Destructor - release member variables. + // + ~CWixSampleBAFunctions() + { + } +}; + + +HRESULT WINAPI CreateBAFunctions( + __in HMODULE hModule, + __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, + __inout BA_FUNCTIONS_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + CWixSampleBAFunctions* pBAFunctions = NULL; + IBootstrapperEngine* pEngine = NULL; + + // This is required to enable logging functions. + hr = BalInitializeFromCreateArgs(pArgs->pBootstrapperCreateArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize Bal."); + + pBAFunctions = new CWixSampleBAFunctions(hModule, pEngine, pArgs); + ExitOnNull(pBAFunctions, hr, E_OUTOFMEMORY, "Failed to create new CWixSampleBAFunctions object."); + + pResults->pfnBAFunctionsProc = BalBaseBAFunctionsProc; + pResults->pvBAFunctionsProcContext = pBAFunctions; + pBAFunctions = NULL; + +LExit: + ReleaseObject(pBAFunctions); + ReleaseObject(pEngine); + + return hr; +} diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.cpp b/src/ext/Bal/Samples/bafunctions/bafunctions.cpp new file mode 100644 index 00000000..b20f4230 --- /dev/null +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.cpp @@ -0,0 +1,46 @@ +// 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. + +#include "precomp.h" + +static HINSTANCE vhInstance = NULL; + +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID /* pvReserved */ + ) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + ::DisableThreadLibraryCalls(hInstance); + vhInstance = hInstance; + break; + + case DLL_PROCESS_DETACH: + vhInstance = NULL; + break; + } + + return TRUE; +} + +extern "C" HRESULT WINAPI BAFunctionsCreate( + __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, + __inout BA_FUNCTIONS_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + + hr = CreateBAFunctions(vhInstance, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create BAFunctions interface."); + +LExit: + return hr; +} + +extern "C" void WINAPI BAFunctionsDestroy( + ) +{ + BalUninitialize(); +} diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.def b/src/ext/Bal/Samples/bafunctions/bafunctions.def new file mode 100644 index 00000000..6e016dad --- /dev/null +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.def @@ -0,0 +1,6 @@ +; 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. + + +EXPORTS + BAFunctionsCreate + BAFunctionsDestroy diff --git a/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj new file mode 100644 index 00000000..640c812d --- /dev/null +++ b/src/ext/Bal/Samples/bafunctions/bafunctions.vcxproj @@ -0,0 +1,81 @@ + + + + + + + + + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + {EB0A7D51-2133-4EE7-B6CA-87DBEAC67E02} + DynamicLibrary + v142 + Unicode + BAFunctions + bafunctions.def + + + + + + + comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib + + + + + Create + + + + + + + + + + + + + + + + + + + + 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}. + + + + + + + diff --git a/src/ext/Bal/Samples/bafunctions/packages.config b/src/ext/Bal/Samples/bafunctions/packages.config new file mode 100644 index 00000000..548ddb48 --- /dev/null +++ b/src/ext/Bal/Samples/bafunctions/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/Samples/bafunctions/precomp.h b/src/ext/Bal/Samples/bafunctions/precomp.h new file mode 100644 index 00000000..9d2fe726 --- /dev/null +++ b/src/ext/Bal/Samples/bafunctions/precomp.h @@ -0,0 +1,52 @@ +#pragma once +// 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. + + +#include + +#pragma warning(push) +#pragma warning(disable:4458) // declaration of 'xxx' hides class member +#include +#pragma warning(pop) + +#include +#include +#include +#include +#include +#include +#include + +// Standard WiX header files, include as required +#include "dutil.h" +//#include "memutil.h" +//#include "dictutil.h" +//#include "dirutil.h" +#include "fileutil.h" +#include "locutil.h" +//#include "logutil.h" +#include "pathutil.h" +//#include "resrutil.h" +//#include "shelutil.h" +#include "strutil.h" +#include "thmutil.h" +//#include "uriutil.h" +//#include "xmlutil.h" +#include "regutil.h" + +//#include "IBootstrapperEngine.h" +//#include "IBootstrapperApplication.h" + +#include "BalBaseBootstrapperApplication.h" +//#include "balinfo.h" +//#include "balcondition.h" +#include "balutil.h" + +#include "BAFunctions.h" +#include "IBAFunctions.h" + +HRESULT WINAPI CreateBAFunctions( + __in HMODULE hModule, + __in const BA_FUNCTIONS_CREATE_ARGS* pArgs, + __inout BA_FUNCTIONS_CREATE_RESULTS* pResults + ); diff --git a/src/ext/Bal/Samples/bafunctions/resource.h b/src/ext/Bal/Samples/bafunctions/resource.h new file mode 100644 index 00000000..149a8ff4 --- /dev/null +++ b/src/ext/Bal/Samples/bafunctions/resource.h @@ -0,0 +1,15 @@ +// 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. + +#define IDC_STATIC -1 + + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/ext/Bal/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs b/src/ext/Bal/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs new file mode 100644 index 00000000..d38fd1a9 --- /dev/null +++ b/src/ext/Bal/WixToolset.Dnc.Host/BootstrapperApplicationFactory.cs @@ -0,0 +1,89 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Linq; + using System.Reflection; + using System.Runtime.InteropServices; + + delegate IBootstrapperApplicationFactory StaticEntryDelegate([MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyName, [MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyPath); + + /// + /// Entry point for the .NET Core host to create and return the BA to the engine. + /// Reflection is used instead of referencing WixToolset.Mba.Core directly to avoid requiring it in the AssemblyLoadContext. + /// + public sealed class BootstrapperApplicationFactory : IBootstrapperApplicationFactory + { + private string baFactoryAssemblyName; + private string baFactoryAssemblyPath; + + public BootstrapperApplicationFactory(string baFactoryAssemblyName, string baFactoryAssemblyPath) + { + this.baFactoryAssemblyName = baFactoryAssemblyName; + this.baFactoryAssemblyPath = baFactoryAssemblyPath; + } + + /// + /// Loads the bootstrapper application assembly and calls its IBootstrapperApplicationFactory.Create method. + /// + /// Pointer to BOOTSTRAPPER_CREATE_ARGS struct. + /// Pointer to BOOTSTRAPPER_CREATE_RESULTS struct. + /// The bootstrapper application assembly + /// does not define the . + public void Create(IntPtr pArgs, IntPtr pResults) + { + // Load the BA's IBootstrapperApplicationFactory. + var baFactoryType = BootstrapperApplicationFactory.GetBAFactoryTypeFromAssembly(this.baFactoryAssemblyName, this.baFactoryAssemblyPath); + var baFactory = Activator.CreateInstance(baFactoryType); + if (null == baFactory) + { + throw new InvalidBootstrapperApplicationFactoryException(); + } + + var createMethod = baFactoryType.GetMethod(nameof(Create), new[] { typeof(IntPtr), typeof(IntPtr) }); + if (null == createMethod) + { + throw new InvalidBootstrapperApplicationFactoryException(); + } + createMethod.Invoke(baFactory, new object[] { pArgs, pResults }); + } + + /// + /// Locates the and returns the specified type. + /// + /// The assembly that defines the IBootstrapperApplicationFactory implementation. + /// The bootstrapper application factory . + private static Type GetBAFactoryTypeFromAssembly(string assemblyName, string assemblyPath) + { + // The default ALC shouldn't need help loading the assembly, since the host should have provided the deps.json + // when starting the runtime. But it doesn't hurt so keep this in case an isolated ALC is ever needed. + var alc = new DnchostAssemblyLoadContext(assemblyPath, false); + var asm = alc.LoadFromAssemblyName(new AssemblyName(assemblyName)); + + var attr = asm.GetCustomAttributes() + .Where(a => a.GetType().FullName == "WixToolset.Mba.Core.BootstrapperApplicationFactoryAttribute") + .SingleOrDefault(); + + if (null == attr) + { + throw new MissingAttributeException(); + } + + var baFactoryTypeProperty = attr.GetType().GetProperty("BootstrapperApplicationFactoryType", typeof(Type)); + if (baFactoryTypeProperty == null || baFactoryTypeProperty.GetMethod == null) + { + throw new MissingAttributeException(); + } + + var baFactoryType = (Type)baFactoryTypeProperty.GetMethod.Invoke(attr, null); + return baFactoryType; + } + + // Entry point for the DNC host. + public static IBootstrapperApplicationFactory CreateBAFactory([MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyName, [MarshalAs(UnmanagedType.LPWStr)] string baFactoryAssemblyPath) + { + return new BootstrapperApplicationFactory(baFactoryAssemblyName, baFactoryAssemblyPath); + } + } +} diff --git a/src/ext/Bal/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs b/src/ext/Bal/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs new file mode 100644 index 00000000..1a383058 --- /dev/null +++ b/src/ext/Bal/WixToolset.Dnc.Host/DnchostAssemblyLoadContext.cs @@ -0,0 +1,58 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Reflection; + using System.Runtime.Loader; + + public sealed class DnchostAssemblyLoadContext : AssemblyLoadContext + { + private readonly AssemblyDependencyResolver resolver; + + public DnchostAssemblyLoadContext(string assemblyPath, bool isolateFromDefault) + : base(nameof(DnchostAssemblyLoadContext), isolateFromDefault) + { + this.resolver = new AssemblyDependencyResolver(assemblyPath); + + if (!this.IsCollectible) + { + AssemblyLoadContext.Default.Resolving += this.ResolveAssembly; + AssemblyLoadContext.Default.ResolvingUnmanagedDll += this.ResolveUnmanagedDll; + } + } + + private Assembly ResolveAssembly(AssemblyLoadContext defaultAlc, AssemblyName assemblyName) + { + var path = this.resolver.ResolveAssemblyToPath(assemblyName); + if (path != null) + { + var targetAlc = this.IsCollectible ? this : defaultAlc; + return targetAlc.LoadFromAssemblyPath(path); + } + + return null; + } + + private IntPtr ResolveUnmanagedDll(Assembly assembly, string unmanagedDllName) + { + var path = this.resolver.ResolveUnmanagedDllToPath(unmanagedDllName); + if (path != null) + { + return this.LoadUnmanagedDllFromPath(path); + } + + return IntPtr.Zero; + } + + protected override Assembly Load(AssemblyName assemblyName) + { + return this.ResolveAssembly(AssemblyLoadContext.Default, assemblyName); + } + + protected override IntPtr LoadUnmanagedDll(string unmanagedDllName) + { + return this.ResolveUnmanagedDll(null, unmanagedDllName); + } + } +} diff --git a/src/ext/Bal/WixToolset.Dnc.Host/Exceptions.cs b/src/ext/Bal/WixToolset.Dnc.Host/Exceptions.cs new file mode 100644 index 00000000..32d4d4c5 --- /dev/null +++ b/src/ext/Bal/WixToolset.Dnc.Host/Exceptions.cs @@ -0,0 +1,145 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Runtime.Serialization; + + /// + /// Base class for exception returned to the bootstrapper application host. + /// + [Serializable] + public abstract class BootstrapperException : Exception + { + /// + /// Creates an instance of the base class with the given HRESULT. + /// + /// The HRESULT for the exception that is used by the bootstrapper application host. + public BootstrapperException(int hr) + { + this.HResult = hr; + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public BootstrapperException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public BootstrapperException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected BootstrapperException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } + + /// + /// The bootstrapper application assembly loaded by the host does not contain exactly one instance of the + /// class. + /// + /// + [Serializable] + public class MissingAttributeException : BootstrapperException + { + /// + /// Creates a new instance of the class. + /// + public MissingAttributeException() + : base(NativeMethods.E_NOTFOUND) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public MissingAttributeException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public MissingAttributeException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected MissingAttributeException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } + + /// + /// The bootstrapper application factory specified by the + /// does not extend the base class. + /// + /// + /// + [Serializable] + public class InvalidBootstrapperApplicationFactoryException : BootstrapperException + { + /// + /// Creates a new instance of the class. + /// + public InvalidBootstrapperApplicationFactoryException() + : base(NativeMethods.E_UNEXPECTED) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public InvalidBootstrapperApplicationFactoryException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public InvalidBootstrapperApplicationFactoryException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected InvalidBootstrapperApplicationFactoryException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } +} diff --git a/src/ext/Bal/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs b/src/ext/Bal/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs new file mode 100644 index 00000000..96731192 --- /dev/null +++ b/src/ext/Bal/WixToolset.Dnc.Host/IBootstrapperApplicationFactory.cs @@ -0,0 +1,16 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Runtime.InteropServices; + + [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)] + public interface IBootstrapperApplicationFactory + { + void Create( + IntPtr pArgs, + IntPtr pResults + ); + } +} diff --git a/src/ext/Bal/WixToolset.Dnc.Host/NativeMethods.cs b/src/ext/Bal/WixToolset.Dnc.Host/NativeMethods.cs new file mode 100644 index 00000000..6dc393c6 --- /dev/null +++ b/src/ext/Bal/WixToolset.Dnc.Host/NativeMethods.cs @@ -0,0 +1,18 @@ +// 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. + +namespace WixToolset.Dnc.Host +{ + using System; + using System.Runtime.InteropServices; + + /// + /// Contains native constants, functions, and structures for this assembly. + /// + internal static class NativeMethods + { + #region Error Constants + internal const int E_NOTFOUND = unchecked((int)0x80070490); + internal const int E_UNEXPECTED = unchecked((int)0x8000ffff); + #endregion + } +} diff --git a/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj b/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj new file mode 100644 index 00000000..f347ca0b --- /dev/null +++ b/src/ext/Bal/WixToolset.Dnc.Host/WixToolset.Dnc.Host.csproj @@ -0,0 +1,44 @@ + + + + + + netcoreapp3.1 + WixToolset.Dnc.Host + WiX Toolset .NET Core BA Host + WiX Toolset .NET Core BA Host + embedded + AnyCPU + + + + + False + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs b/src/ext/Bal/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs new file mode 100644 index 00000000..78e68bd9 --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/BootstrapperApplicationFactory.cs @@ -0,0 +1,86 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + using System.Reflection; + using System.Runtime.InteropServices; + using WixToolset.Mba.Core; + + /// + /// Entry point for the managed host to create and return the BA to the engine. + /// + [ClassInterface(ClassInterfaceType.None)] + public sealed class BootstrapperApplicationFactory : MarshalByRefObject, IBootstrapperApplicationFactory + { + /// + /// Creates a new instance of the class. + /// Entry point for the MBA host. + /// + public BootstrapperApplicationFactory() + { + } + + /// + /// Loads the bootstrapper application assembly and calls its IBootstrapperApplicationFactory.Create method. + /// + /// Pointer to BOOTSTRAPPER_CREATE_ARGS struct. + /// Pointer to BOOTSTRAPPER_CREATE_RESULTS struct. + /// The bootstrapper application assembly + /// does not define the . + public void Create(IntPtr pArgs, IntPtr pResults) + { + // Get the wix.boostrapper section group to get the name of the bootstrapper application assembly to host. + var section = ConfigurationManager.GetSection("wix.bootstrapper/host") as HostSection; + if (null == section) + { + throw new MissingAttributeException(); // TODO: throw a more specific exception than this. + } + + // Load the BA's IBootstrapperApplicationFactory. + var baFactoryType = BootstrapperApplicationFactory.GetBAFactoryTypeFromAssembly(section.AssemblyName); + var baFactory = (IBootstrapperApplicationFactory)Activator.CreateInstance(baFactoryType); + if (null == baFactory) + { + throw new InvalidBootstrapperApplicationFactoryException(); + } + + baFactory.Create(pArgs, pResults); + } + + /// + /// Locates the and returns the specified type. + /// + /// The assembly that defines the IBootstrapperApplicationFactory implementation. + /// The bootstrapper application factory . + private static Type GetBAFactoryTypeFromAssembly(string assemblyName) + { + Type baFactoryType = null; + + // Load the requested assembly. + Assembly asm = AppDomain.CurrentDomain.Load(assemblyName); + + // If an assembly was loaded and is not the current assembly, check for the required attribute. + // This is done to avoid using the BootstrapperApplicationFactoryAttribute which we use at build time + // to specify the BootstrapperApplicationFactory assembly in the manifest. + if (!Assembly.GetExecutingAssembly().Equals(asm)) + { + // There must be one and only one BootstrapperApplicationFactoryAttribute. + // The attribute prevents multiple declarations already. + var attrs = (BootstrapperApplicationFactoryAttribute[])asm.GetCustomAttributes(typeof(BootstrapperApplicationFactoryAttribute), false); + if (null != attrs) + { + baFactoryType = attrs[0].BootstrapperApplicationFactoryType; + } + } + + if (null == baFactoryType) + { + throw new MissingAttributeException(); + } + + return baFactoryType; + } + } +} diff --git a/src/ext/Bal/WixToolset.Mba.Host/BootstrapperSectionGroup.cs b/src/ext/Bal/WixToolset.Mba.Host/BootstrapperSectionGroup.cs new file mode 100644 index 00000000..5cf1bc9c --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/BootstrapperSectionGroup.cs @@ -0,0 +1,29 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + + /// + /// Handler for the wix.bootstrapper configuration section group. + /// + public class BootstrapperSectionGroup : ConfigurationSectionGroup + { + /// + /// Creates a new instance of the class. + /// + public BootstrapperSectionGroup() + { + } + + /// + /// Gets the handler for the mba configuration section. + /// + [ConfigurationProperty("host")] + public HostSection Host + { + get { return (HostSection)base.Sections["host"]; } + } + } +} diff --git a/src/ext/Bal/WixToolset.Mba.Host/Exceptions.cs b/src/ext/Bal/WixToolset.Mba.Host/Exceptions.cs new file mode 100644 index 00000000..c68951f0 --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/Exceptions.cs @@ -0,0 +1,145 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Runtime.Serialization; + + /// + /// Base class for exception returned to the bootstrapper application host. + /// + [Serializable] + public abstract class BootstrapperException : Exception + { + /// + /// Creates an instance of the base class with the given HRESULT. + /// + /// The HRESULT for the exception that is used by the bootstrapper application host. + public BootstrapperException(int hr) + { + this.HResult = hr; + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public BootstrapperException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public BootstrapperException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected BootstrapperException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } + + /// + /// The bootstrapper application assembly loaded by the host does not contain exactly one instance of the + /// class. + /// + /// + [Serializable] + public class MissingAttributeException : BootstrapperException + { + /// + /// Creates a new instance of the class. + /// + public MissingAttributeException() + : base(NativeMethods.E_NOTFOUND) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public MissingAttributeException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public MissingAttributeException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected MissingAttributeException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } + + /// + /// The bootstrapper application factory specified by the + /// does not extend the base class. + /// + /// + /// + [Serializable] + public class InvalidBootstrapperApplicationFactoryException : BootstrapperException + { + /// + /// Creates a new instance of the class. + /// + public InvalidBootstrapperApplicationFactoryException() + : base(NativeMethods.E_UNEXPECTED) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message. + public InvalidBootstrapperApplicationFactoryException(string message) + : base(message) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Exception message + /// Inner exception associated with this one + public InvalidBootstrapperApplicationFactoryException(string message, Exception innerException) + : base(message, innerException) + { + } + + /// + /// Initializes a new instance of the class. + /// + /// Serialization information for this exception + /// Streaming context to serialize to + protected InvalidBootstrapperApplicationFactoryException(SerializationInfo info, StreamingContext context) + : base(info, context) + { + } + } +} diff --git a/src/ext/Bal/WixToolset.Mba.Host/HostSection.cs b/src/ext/Bal/WixToolset.Mba.Host/HostSection.cs new file mode 100644 index 00000000..632025c7 --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/HostSection.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + + /// + /// Handler for the Host configuration section. + /// + public sealed class HostSection : ConfigurationSection + { + private static readonly ConfigurationProperty assemblyNameProperty = new ConfigurationProperty("assemblyName", typeof(string), null, ConfigurationPropertyOptions.IsRequired); + private static readonly ConfigurationProperty supportedFrameworksProperty = new ConfigurationProperty("", typeof(SupportedFrameworkElementCollection), null, ConfigurationPropertyOptions.IsDefaultCollection); + + /// + /// Creates a new instance of the class. + /// + public HostSection() + { + } + + /// + /// Gets the name of the assembly that contians the child class. + /// + /// + /// The assembly specified by this name must contain the to identify + /// the type of the child class. + /// + [ConfigurationProperty("assemblyName", IsRequired = true)] + public string AssemblyName + { + get { return (string)base[assemblyNameProperty]; } + set { base[assemblyNameProperty] = value; } + } + + /// + /// Gets the of supported frameworks for the host configuration. + /// + [ConfigurationProperty("", IsDefaultCollection = true)] + [ConfigurationCollection(typeof(SupportedFrameworkElement))] + public SupportedFrameworkElementCollection SupportedFrameworks + { + get { return (SupportedFrameworkElementCollection)base[supportedFrameworksProperty]; } + } + } +} diff --git a/src/ext/Bal/WixToolset.Mba.Host/NativeMethods.cs b/src/ext/Bal/WixToolset.Mba.Host/NativeMethods.cs new file mode 100644 index 00000000..b9fc85a0 --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/NativeMethods.cs @@ -0,0 +1,18 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Runtime.InteropServices; + + /// + /// Contains native constants, functions, and structures for this assembly. + /// + internal static class NativeMethods + { + #region Error Constants + internal const int E_NOTFOUND = unchecked((int)0x80070490); + internal const int E_UNEXPECTED = unchecked((int)0x8000ffff); + #endregion + } +} diff --git a/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElement.cs b/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElement.cs new file mode 100644 index 00000000..fe7fd2eb --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElement.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + + /// + /// Handler for the supportedFramework configuration section. + /// + public sealed class SupportedFrameworkElement : ConfigurationElement + { + private static readonly ConfigurationProperty versionProperty = new ConfigurationProperty("version", typeof(string), null, ConfigurationPropertyOptions.IsRequired); + private static readonly ConfigurationProperty runtimeVersionProperty = new ConfigurationProperty("runtimeVersion", typeof(string)); + + /// + /// Creates a new instance of the class. + /// + public SupportedFrameworkElement() + { + } + + /// + /// Gets the version of the supported framework. + /// + /// + /// The assembly specified by this name must contain a value matching the NETFX version registry key under + /// "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\NET Framework Setup\NDP". + /// + [ConfigurationProperty("version", IsRequired = true)] + public string Version + { + get { return (string)base[versionProperty]; } + set { base[versionProperty] = value; } + } + + /// + /// Gets the runtime version required by this supported framework. + /// + [ConfigurationProperty("runtimeVersion", IsRequired = false)] + public string RuntimeVersion + { + get { return (string)base[runtimeVersionProperty]; } + set { base[runtimeVersionProperty] = value; } + } + } +} diff --git a/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs b/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs new file mode 100644 index 00000000..12c7cf3e --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/SupportedFrameworkElementCollection.cs @@ -0,0 +1,36 @@ +// 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. + +namespace WixToolset.Mba.Host +{ + using System; + using System.Configuration; + using System.Diagnostics.CodeAnalysis; + + /// + /// Handler for the supportedFramework collection. + /// + [SuppressMessage("Microsoft.Design", "CA1010:CollectionsShouldImplementGenericInterface")] + [ConfigurationCollection(typeof(SupportedFrameworkElement), AddItemName = "supportedFramework", CollectionType = ConfigurationElementCollectionType.BasicMap)] + public sealed class SupportedFrameworkElementCollection : ConfigurationElementCollection + { + public override ConfigurationElementCollectionType CollectionType + { + get { return ConfigurationElementCollectionType.BasicMap; } + } + + protected override string ElementName + { + get { return "supportedFramework"; } + } + + protected override ConfigurationElement CreateNewElement() + { + return new SupportedFrameworkElement(); + } + + protected override object GetElementKey(ConfigurationElement element) + { + return (element as SupportedFrameworkElement).Version; + } + } +} diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config new file mode 100644 index 00000000..a19b66f1 --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.config @@ -0,0 +1,26 @@ + + + + + + + +
+ + + + + + + + + + + + + + diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj new file mode 100644 index 00000000..3ee0ad1e --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.csproj @@ -0,0 +1,54 @@ + + + + + + WixToolset.Mba.Host + WixToolset.Mba.Host + net20 + Managed Bootstrapper Application entry point + embedded + $(MSBuildThisFileName).nuspec + AnyCPU + + + + + + + + + + + + + + + + False + + + + + + + + + + + + + + + + + + + + + + $(OutputPath) + Id=$(AssemblyName);Version=$(BuildVersionSimple);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl) + + + \ No newline at end of file diff --git a/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec new file mode 100644 index 00000000..00fd21ac --- /dev/null +++ b/src/ext/Bal/WixToolset.Mba.Host/WixToolset.Mba.Host.nuspec @@ -0,0 +1,23 @@ + + + + $id$ + $version$ + WiX Toolset Team + WiX Toolset Team + MS-RL + https://github.com/wixtoolset/Bal.wixext + false + $description$ + $copyright$ + + + + + + + + + + + diff --git a/src/ext/Bal/appveyor.cmd b/src/ext/Bal/appveyor.cmd new file mode 100644 index 00000000..f4e9c26e --- /dev/null +++ b/src/ext/Bal/appveyor.cmd @@ -0,0 +1,17 @@ +@setlocal +@pushd %~dp0 +@set _C=Release + +nuget restore || exit /b + +msbuild -p:Configuration=%_C% -Restore || exit /b +msbuild -p:Configuration=%_C% src\test\examples\examples.proj || exit /b + +dotnet test -c %_C% --no-build src\test\WixToolsetTest.Bal || exit /b +dotnet test -c %_C% --no-build src\test\WixToolsetTest.ManagedHost || exit /b + +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\wixext\WixToolset.Bal.wixext.csproj || exit /b +msbuild -p:Configuration=%_C% -p:NoBuild=true -t:Pack src\WixToolset.Mba.Host\WixToolset.Mba.Host.csproj || exit /b + +@popd +@endlocal diff --git a/src/ext/Bal/appveyor.yml b/src/ext/Bal/appveyor.yml new file mode 100644 index 00000000..7c686b04 --- /dev/null +++ b/src/ext/Bal/appveyor.yml @@ -0,0 +1,40 @@ +# 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. +# +# Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml +# then update all of the repos. + +branches: + only: + - master + - develop + +image: Visual Studio 2019 + +version: 0.0.0.{build} +configuration: Release + +environment: + DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true + DOTNET_CLI_TELEMETRY_OPTOUT: 1 + NUGET_XMLDOC_MODE: skip + +build_script: + - appveyor.cmd + +pull_requests: + do_not_increment_build_number: true + +nuget: + disable_publish_on_pr: true + +skip_branch_with_pr: true +skip_tags: true + +artifacts: +- path: build\Release\**\*.nupkg + name: nuget + +notifications: +- provider: Slack + incoming_webhook: + secure: p5xuu+4x2JHfwGDMDe5KcG1k7gZxqYc4jWVwvyNZv5cvkubPD2waJs5yXMAXZNN7Z63/3PWHb7q4KoY/99AjauYa1nZ4c5qYqRPFRBKTHfA= diff --git a/src/ext/Bal/dnchost/coreclrhost.h b/src/ext/Bal/dnchost/coreclrhost.h new file mode 100644 index 00000000..07f28735 --- /dev/null +++ b/src/ext/Bal/dnchost/coreclrhost.h @@ -0,0 +1,137 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. +// See the LICENSE file in the project root for more information. + + + +// ***** ABOUT THIS HEADER ***** +// ************************************************************************************** +// +// This is the version on 2019-12-22 from +// https://github.com/dotnet/runtime/blob/master/src/coreclr/src/coreclr/hosts/inc/coreclrhost.h +// +// ************************************************************************************** +// **************************** + + +// +// APIs for hosting CoreCLR +// + +#ifndef __CORECLR_HOST_H__ +#define __CORECLR_HOST_H__ + +#if defined(_WIN32) && defined(_M_IX86) +#define CORECLR_CALLING_CONVENTION __stdcall +#else +#define CORECLR_CALLING_CONVENTION +#endif + +// For each hosting API, we define a function prototype and a function pointer +// The prototype is useful for implicit linking against the dynamic coreclr +// library and the pointer for explicit dynamic loading (dlopen, LoadLibrary) +#define CORECLR_HOSTING_API(function, ...) \ + extern "C" int CORECLR_CALLING_CONVENTION function(__VA_ARGS__); \ + typedef int (CORECLR_CALLING_CONVENTION *function##_ptr)(__VA_ARGS__) + +// +// Initialize the CoreCLR. Creates and starts CoreCLR host and creates an app domain +// +// Parameters: +// exePath - Absolute path of the executable that invoked the ExecuteAssembly (the native host application) +// appDomainFriendlyName - Friendly name of the app domain that will be created to execute the assembly +// propertyCount - Number of properties (elements of the following two arguments) +// propertyKeys - Keys of properties of the app domain +// propertyValues - Values of properties of the app domain +// hostHandle - Output parameter, handle of the created host +// domainId - Output parameter, id of the created app domain +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_initialize, + const char* exePath, + const char* appDomainFriendlyName, + int propertyCount, + const char** propertyKeys, + const char** propertyValues, + void** hostHandle, + unsigned int* domainId); + +// +// Shutdown CoreCLR. It unloads the app domain and stops the CoreCLR host. +// +// Parameters: +// hostHandle - Handle of the host +// domainId - Id of the domain +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_shutdown, + void* hostHandle, + unsigned int domainId); + +// +// Shutdown CoreCLR. It unloads the app domain and stops the CoreCLR host. +// +// Parameters: +// hostHandle - Handle of the host +// domainId - Id of the domain +// latchedExitCode - Latched exit code after domain unloaded +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_shutdown_2, + void* hostHandle, + unsigned int domainId, + int* latchedExitCode); + +// +// Create a native callable function pointer for a managed method. +// +// Parameters: +// hostHandle - Handle of the host +// domainId - Id of the domain +// entryPointAssemblyName - Name of the assembly which holds the custom entry point +// entryPointTypeName - Name of the type which holds the custom entry point +// entryPointMethodName - Name of the method which is the custom entry point +// delegate - Output parameter, the function stores a native callable function pointer to the delegate at the specified address +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_create_delegate, + void* hostHandle, + unsigned int domainId, + const char* entryPointAssemblyName, + const char* entryPointTypeName, + const char* entryPointMethodName, + void** delegate); + +// +// Execute a managed assembly with given arguments +// +// Parameters: +// hostHandle - Handle of the host +// domainId - Id of the domain +// argc - Number of arguments passed to the executed assembly +// argv - Array of arguments passed to the executed assembly +// managedAssemblyPath - Path of the managed assembly to execute (or NULL if using a custom entrypoint). +// exitCode - Exit code returned by the executed assembly +// +// Returns: +// HRESULT indicating status of the operation. S_OK if the assembly was successfully executed +// +CORECLR_HOSTING_API(coreclr_execute_assembly, + void* hostHandle, + unsigned int domainId, + int argc, + const char** argv, + const char* managedAssemblyPath, + unsigned int* exitCode); + +#undef CORECLR_HOSTING_API + +#endif // __CORECLR_HOST_H__ \ No newline at end of file diff --git a/src/ext/Bal/dnchost/dnchost.cpp b/src/ext/Bal/dnchost/dnchost.cpp new file mode 100644 index 00000000..8ca326fc --- /dev/null +++ b/src/ext/Bal/dnchost/dnchost.cpp @@ -0,0 +1,309 @@ +// 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. + +#include "precomp.h" + +static DNCSTATE vstate = { }; + + +// internal function declarations + +static HRESULT LoadModulePaths( + __in DNCSTATE* pState + ); +static HRESULT LoadDncConfiguration( + __in DNCSTATE* pState, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs + ); +static HRESULT LoadRuntime( + __in DNCSTATE* pState + ); +static HRESULT LoadManagedBootstrapperApplicationFactory( + __in DNCSTATE* pState + ); +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in LPCWSTR wzAppBase, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); + + +// function definitions + +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID /* pvReserved */ + ) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + ::DisableThreadLibraryCalls(hInstance); + vstate.hInstance = hInstance; + break; + + case DLL_PROCESS_DETACH: + vstate.hInstance = NULL; + break; + } + + return TRUE; +} + +extern "C" HRESULT WINAPI BootstrapperApplicationCreate( + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + HRESULT hrHostInitialization = S_OK; + IBootstrapperEngine* pEngine = NULL; + + // coreclr.dll doesn't support unloading, so the rest of the .NET Core hosting stack doesn't support it either. + // This means we also can't unload. + pResults->fDisableUnloading = TRUE; + + hr = BalInitializeFromCreateArgs(pArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize Bal."); + + if (!vstate.fInitialized) + { + hr = XmlInitialize(); + BalExitOnFailure(hr, "Failed to initialize XML."); + + hr = LoadModulePaths(&vstate); + BalExitOnFailure(hr, "Failed to get the host base path."); + + hr = LoadDncConfiguration(&vstate, pArgs); + BalExitOnFailure(hr, "Failed to get the dnc configuration."); + + vstate.fInitialized = TRUE; + } + + if (!vstate.fInitializedRuntime) + { + hr = LoadRuntime(&vstate); + + vstate.fInitializedRuntime = SUCCEEDED(hr); + } + + if (vstate.fInitializedRuntime) + { + if (!vstate.pAppFactory) + { + hr = LoadManagedBootstrapperApplicationFactory(&vstate); + BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application factory."); + } + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading .NET Core %ls bootstrapper application.", DNCHOSTTYPE_FDD == vstate.type ? L"FDD" : L"SCD"); + + hr = vstate.pAppFactory->Create(pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the .NET Core bootstrapper application."); + } + else // fallback to the prerequisite BA. + { + if (DNCHOSTTYPE_SCD == vstate.type) + { + hrHostInitialization = E_DNCHOST_SCD_RUNTIME_FAILURE; + BalLogError(hr, "The self-contained .NET Core runtime failed to load. This is an unrecoverable error."); + } + else + { + hrHostInitialization = S_OK; + } + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because .NET Core host could not be loaded, error: 0x%08x.", hr); + + hr = CreatePrerequisiteBA(hrHostInitialization, pEngine, vstate.sczAppBase, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application."); + } + +LExit: + ReleaseNullObject(pEngine); + + return hr; +} + +extern "C" void WINAPI BootstrapperApplicationDestroy() +{ + if (vstate.hMbapreqModule) + { + PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast(::GetProcAddress(vstate.hMbapreqModule, "DncPrereqBootstrapperApplicationDestroy")); + if (pfnDestroy) + { + (*pfnDestroy)(); + } + + ::FreeLibrary(vstate.hMbapreqModule); + vstate.hMbapreqModule = NULL; + } + + BalUninitialize(); +} + +static HRESULT LoadModulePaths( + __in DNCSTATE* pState + ) +{ + HRESULT hr = S_OK; + + hr = PathForCurrentProcess(&pState->sczModuleFullPath, pState->hInstance); + BalExitOnFailure(hr, "Failed to get the full host path."); + + hr = PathGetDirectory(pState->sczModuleFullPath, &pState->sczAppBase); + BalExitOnFailure(hr, "Failed to get the directory of the full process path."); + + hr = PathConcat(pState->sczAppBase, DNC_ASSEMBLY_FILE_NAME, &pState->sczManagedHostPath); + BalExitOnFailure(hr, "Failed to create managed host path."); + +LExit: + return hr; +} + +static HRESULT LoadDncConfiguration( + __in DNCSTATE* pState, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs + ) +{ + HRESULT hr = S_OK; + IXMLDOMDocument* pixdManifest = NULL; + IXMLDOMNode* pixnHost = NULL; + LPWSTR sczPayloadName = NULL; + DWORD dwBool = 0; + + hr = XmlLoadDocumentFromFile(pArgs->pCommand->wzBootstrapperApplicationDataPath, &pixdManifest); + BalExitOnFailure(hr, "Failed to load BalManifest '%ls'", pArgs->pCommand->wzBootstrapperApplicationDataPath); + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBalBAFactoryAssembly", &pixnHost); + BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly element."); + + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config."); + } + + hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName); + BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath."); + + hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath); + BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath."); + + LPCWSTR wzFileName = PathFile(pState->sczBaFactoryAssemblyPath); + LPCWSTR wzExtension = PathExtension(pState->sczBaFactoryAssemblyPath); + if (!wzExtension) + { + BalExitOnFailure(hr = E_FAIL, "BaFactoryAssemblyPath has no extension."); + } + + hr = StrAllocString(&pState->sczBaFactoryAssemblyName, wzFileName, wzExtension - wzFileName); + BalExitOnFailure(hr, "Failed to copy BAFactoryAssembly payload Name."); + + hr = StrAllocString(&pState->sczBaFactoryDepsJsonPath, pState->sczBaFactoryAssemblyPath, wzExtension - pState->sczBaFactoryAssemblyPath); + BalExitOnFailure(hr, "Failed to initialize deps json path."); + + hr = StrAllocString(&pState->sczBaFactoryRuntimeConfigPath, pState->sczBaFactoryDepsJsonPath, 0); + BalExitOnFailure(hr, "Failed to initialize runtime config path."); + + hr = StrAllocConcat(&pState->sczBaFactoryDepsJsonPath, L".deps.json", 0); + BalExitOnFailure(hr, "Failed to concat extension to deps json path."); + + hr = StrAllocConcat(&pState->sczBaFactoryRuntimeConfigPath, L".runtimeconfig.json", 0); + BalExitOnFailure(hr, "Failed to concat extension to runtime config path."); + + pState->type = DNCHOSTTYPE_FDD; + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixDncOptions", &pixnHost); + if (S_FALSE == hr) + { + ExitFunction1(hr = S_OK); + } + BalExitOnFailure(hr, "Failed to find WixDncOptions element in bootstrapper application config."); + + hr = XmlGetAttributeNumber(pixnHost, L"SelfContainedDeployment", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr) && dwBool) + { + pState->type = DNCHOSTTYPE_SCD; + } + BalExitOnFailure(hr, "Failed to get SelfContainedDeployment value."); + +LExit: + ReleaseStr(sczPayloadName); + ReleaseObject(pixnHost); + ReleaseObject(pixdManifest); + + return hr; +} + +static HRESULT LoadRuntime( + __in DNCSTATE* pState + ) +{ + HRESULT hr = S_OK; + + hr = DnchostLoadRuntime( + &pState->hostfxrState, + pState->sczModuleFullPath, + pState->sczManagedHostPath, + pState->sczBaFactoryDepsJsonPath, + pState->sczBaFactoryRuntimeConfigPath); + + return hr; +} + +static HRESULT LoadManagedBootstrapperApplicationFactory( + __in DNCSTATE* pState + ) +{ + HRESULT hr = S_OK; + + hr = DnchostCreateFactory( + &pState->hostfxrState, + pState->sczBaFactoryAssemblyName, + pState->sczBaFactoryAssemblyPath, + &pState->pAppFactory); + + return hr; +} + +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in LPCWSTR wzAppBase, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + LPWSTR sczDncpreqPath = NULL; + HMODULE hModule = NULL; + + hr = PathConcat(wzAppBase, L"dncpreq.dll", &sczDncpreqPath); + BalExitOnFailure(hr, "Failed to get path to pre-requisite BA."); + + hModule = ::LoadLibraryW(sczDncpreqPath); + BalExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL."); + + PFN_DNCPREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast(::GetProcAddress(hModule, "DncPrereqBootstrapperApplicationCreate")); + BalExitOnNullWithLastError(pfnCreate, hr, "Failed to get DncPrereqBootstrapperApplicationCreate entry-point from: %ls", sczDncpreqPath); + + hr = pfnCreate(hrHostInitialization, pEngine, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create prequisite bootstrapper app."); + + vstate.hMbapreqModule = hModule; + hModule = NULL; + +LExit: + if (hModule) + { + ::FreeLibrary(hModule); + } + ReleaseStr(sczDncpreqPath); + + return hr; +} diff --git a/src/ext/Bal/dnchost/dnchost.def b/src/ext/Bal/dnchost/dnchost.def new file mode 100644 index 00000000..4488df94 --- /dev/null +++ b/src/ext/Bal/dnchost/dnchost.def @@ -0,0 +1,6 @@ +; 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. + + +EXPORTS + BootstrapperApplicationCreate + BootstrapperApplicationDestroy diff --git a/src/ext/Bal/dnchost/dnchost.h b/src/ext/Bal/dnchost/dnchost.h new file mode 100644 index 00000000..22fd8f5e --- /dev/null +++ b/src/ext/Bal/dnchost/dnchost.h @@ -0,0 +1,35 @@ +#pragma once +// 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. + + +enum DNCHOSTTYPE +{ + DNCHOSTTYPE_UNKNOWN, + DNCHOSTTYPE_FDD, + DNCHOSTTYPE_SCD, +}; + +extern "C" typedef HRESULT(WINAPI* PFN_DNCPREQ_BOOTSTRAPPER_APPLICATION_CREATE)( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); + +struct DNCSTATE +{ + BOOL fInitialized; + BOOL fInitializedRuntime; + HINSTANCE hInstance; + LPWSTR sczModuleFullPath; + LPWSTR sczAppBase; + LPWSTR sczManagedHostPath; + LPWSTR sczBaFactoryAssemblyName; + LPWSTR sczBaFactoryAssemblyPath; + LPWSTR sczBaFactoryDepsJsonPath; + LPWSTR sczBaFactoryRuntimeConfigPath; + DNCHOSTTYPE type; + HOSTFXR_STATE hostfxrState; + IBootstrapperApplicationFactory* pAppFactory; + HMODULE hMbapreqModule; +}; diff --git a/src/ext/Bal/dnchost/dnchost.vcxproj b/src/ext/Bal/dnchost/dnchost.vcxproj new file mode 100644 index 00000000..bef3f77e --- /dev/null +++ b/src/ext/Bal/dnchost/dnchost.vcxproj @@ -0,0 +1,106 @@ + + + + + + + + + + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {B6F70281-6583-4138-BB7F-AABFEBBB3CA2} + DynamicLibrary + v142 + Unicode + dnchost + dnchost.def + + + + + $(Platform) + x86 + ..\..\packages\runtime.win-$(NetHostPlatform).Microsoft.NETCore.DotNetAppHost.5.0.0\runtimes\win-$(NetHostPlatform)\native\ + shlwapi.lib;$(NetHostPath)libnethost.lib + + + + + + Create + + + + + + + + + + + + + + + + + $(BaseOutputPath)obj;$(NetHostPath);%(AdditionalIncludeDirectories) + + + /LTCG %(AdditionalOptions) + + + + + {0D780900-C2FF-4FA2-8CB5-8A19768724C5} + false + true + + + + + + + + + + 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/ext/Bal/dnchost/dncutil.cpp b/src/ext/Bal/dnchost/dncutil.cpp new file mode 100644 index 00000000..34d14911 --- /dev/null +++ b/src/ext/Bal/dnchost/dncutil.cpp @@ -0,0 +1,411 @@ +// 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. + +#include "precomp.h" + +// https://github.com/dotnet/runtime/blob/master/src/installer/corehost/error_codes.h +#define InvalidArgFailure 0x80008081 +#define HostApiBufferTooSmall 0x80008098 +#define HostApiUnsupportedVersion 0x800080a2 + +// internal function declarations + +static HRESULT GetHostfxrPath( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ); +static HRESULT LoadHostfxr( + __in HOSTFXR_STATE* pState + ); +static HRESULT InitializeHostfxr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzManagedHostPath, + __in LPCWSTR wzDepsJsonPath, + __in LPCWSTR wzRuntimeConfigPath + ); +static HRESULT InitializeCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ); +static HRESULT InitializeCoreClrPre5( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ); +static HRESULT LoadCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzCoreClrPath + ); +static HRESULT StartCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath, + __in DWORD cProperties, + __in LPCWSTR* propertyKeys, + __in LPCWSTR* propertyValues + ); + + +// function definitions + +HRESULT DnchostLoadRuntime( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath, + __in LPCWSTR wzManagedHostPath, + __in LPCWSTR wzDepsJsonPath, + __in LPCWSTR wzRuntimeConfigPath + ) +{ + HRESULT hr = S_OK; + + hr = GetHostfxrPath(pState, wzNativeHostPath); + BalExitOnFailure(hr, "Failed to find hostfxr."); + + hr = LoadHostfxr(pState); + BalExitOnFailure(hr, "Failed to load hostfxr."); + + hr = InitializeHostfxr(pState, wzManagedHostPath, wzDepsJsonPath, wzRuntimeConfigPath); + BalExitOnFailure(hr, "Failed to initialize hostfxr."); + + hr = InitializeCoreClr(pState, wzNativeHostPath); + BalExitOnFailure(hr, "Failed to initialize coreclr."); + +LExit: + return hr; +} + +HRESULT DnchostCreateFactory( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzBaFactoryAssemblyName, + __in LPCWSTR wzBaFactoryAssemblyPath, + __out IBootstrapperApplicationFactory** ppAppFactory + ) +{ + HRESULT hr = S_OK; + PFNCREATEBAFACTORY pfnCreateBAFactory = NULL; + + if (pState->pfnGetFunctionPointer) + { + hr = pState->pfnGetFunctionPointer( + DNC_ENTRY_TYPEW, + DNC_STATIC_ENTRY_METHODW, + DNC_STATIC_ENTRY_DELEGATEW, + NULL, + NULL, + reinterpret_cast(&pfnCreateBAFactory)); + BalExitOnFailure(hr, "Failed to create delegate through GetFunctionPointer."); + } + else + { + hr = pState->pfnCoreclrCreateDelegate( + pState->pClrHandle, + pState->dwDomainId, + DNC_ASSEMBLY_FULL_NAME, + DNC_ENTRY_TYPE, + DNC_STATIC_ENTRY_METHOD, + reinterpret_cast(&pfnCreateBAFactory)); + BalExitOnFailure(hr, "Failed to create delegate in app domain."); + } + + *ppAppFactory = pfnCreateBAFactory(wzBaFactoryAssemblyName, wzBaFactoryAssemblyPath); + +LExit: + return hr; +} + +static HRESULT GetHostfxrPath( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ) +{ + HRESULT hr = S_OK; + get_hostfxr_parameters getHostfxrParameters = { }; + int nrc = 0; + size_t cchHostFxrPath = MAX_PATH; + + getHostfxrParameters.size = sizeof(get_hostfxr_parameters); + getHostfxrParameters.assembly_path = wzNativeHostPath; + + // get_hostfxr_path does a full search on every call, so + // minimize the number of calls + // need to loop + for (;;) + { + cchHostFxrPath *= 2; + hr = StrAlloc(&pState->sczHostfxrPath, cchHostFxrPath); + BalExitOnFailure(hr, "Failed to allocate hostFxrPath."); + + nrc = get_hostfxr_path(pState->sczHostfxrPath, &cchHostFxrPath, &getHostfxrParameters); + if (HostApiBufferTooSmall != nrc) + { + break; + } + } + if (0 != nrc) + { + BalExitOnFailure(hr = nrc, "GetHostfxrPath failed"); + } + +LExit: + return hr; +} + +static HRESULT LoadHostfxr( + __in HOSTFXR_STATE* pState + ) +{ + HRESULT hr = S_OK; + HMODULE hHostfxr; + + hHostfxr = ::LoadLibraryExW(pState->sczHostfxrPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + BalExitOnNullWithLastError(hHostfxr, hr, "Failed to load hostfxr from '%ls'.", pState->sczHostfxrPath); + + pState->pfnHostfxrInitializeForApp = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_initialize_for_dotnet_command_line")); + BalExitOnNullWithLastError(pState->pfnHostfxrInitializeForApp, hr, "Failed to get procedure address for hostfxr_initialize_for_dotnet_command_line."); + + pState->pfnHostfxrGetRuntimeProperties = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_get_runtime_properties")); + BalExitOnNullWithLastError(pState->pfnHostfxrGetRuntimeProperties, hr, "Failed to get procedure address for hostfxr_get_runtime_properties."); + + pState->pfnHostfxrSetErrorWriter = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_set_error_writer")); + BalExitOnNullWithLastError(pState->pfnHostfxrSetErrorWriter, hr, "Failed to get procedure address for hostfxr_set_error_writer."); + + pState->pfnHostfxrClose = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_close")); + BalExitOnNullWithLastError(pState->pfnHostfxrClose, hr, "Failed to get procedure address for hostfxr_close."); + + pState->pfnHostfxrGetRuntimeDelegate = reinterpret_cast(::GetProcAddress(hHostfxr, "hostfxr_get_runtime_delegate")); + BalExitOnNullWithLastError(pState->pfnHostfxrGetRuntimeDelegate, hr, "Failed to get procedure address for hostfxr_get_runtime_delegate."); + +LExit: + // Never unload the module since it isn't meant to be unloaded. + + return hr; +} + +static void HOSTFXR_CALLTYPE DnchostErrorWriter( + __in LPCWSTR wzMessage + ) +{ + BOOTSTRAPPER_LOG_LEVEL level = BOOTSTRAPPER_LOG_LEVEL_ERROR; + + if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, 0, wzMessage, -1, L"The requested delegate type is not available in the target framework.", -1)) + { + level = BOOTSTRAPPER_LOG_LEVEL_DEBUG; + } + + BalLog(level, "error from hostfxr: %ls", wzMessage); +} + +static HRESULT InitializeHostfxr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzManagedHostPath, + __in LPCWSTR wzDepsJsonPath, + __in LPCWSTR wzRuntimeConfigPath + ) +{ + HRESULT hr = S_OK; + + pState->pfnHostfxrSetErrorWriter(static_cast(&DnchostErrorWriter)); + + LPCWSTR argv[] = { + L"exec", + L"--depsfile", + wzDepsJsonPath, + L"--runtimeconfig", + wzRuntimeConfigPath, + wzManagedHostPath, + }; + hr = pState->pfnHostfxrInitializeForApp(sizeof(argv)/sizeof(LPWSTR), argv, NULL, &pState->hostContextHandle); + BalExitOnFailure(hr, "HostfxrInitializeForApp failed"); + +LExit: + return hr; +} + +static HRESULT InitializeCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ) +{ + HRESULT hr = S_OK; + + hr = pState->pfnHostfxrGetRuntimeDelegate(pState->hostContextHandle, hdt_get_function_pointer, reinterpret_cast(&pState->pfnGetFunctionPointer)); + if (InvalidArgFailure == hr || // old versions of hostfxr don't allow calling GetRuntimeDelegate from InitializeForApp. + HostApiUnsupportedVersion == hr) // hdt_get_function_pointer was added in .NET 5. + { + hr = InitializeCoreClrPre5(pState, wzNativeHostPath); + } + else + { + ExitOnFailure(hr, "HostfxrGetRuntimeDelegate failed"); + } + +LExit: + return hr; +} + +static HRESULT InitializeCoreClrPre5( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath + ) +{ + HRESULT hr = S_OK; + int32_t rc = 0; + LPCWSTR* rgPropertyKeys = NULL; + LPCWSTR* rgPropertyValues = NULL; + size_t cProperties = 0; + LPWSTR* rgDirectories = NULL; + UINT cDirectories = 0; + LPWSTR sczCoreClrPath = NULL; + + // We are not using hostfxr as it was intended to be used. We need to initialize hostfxr so that it properly initializes hostpolicy - + // there are pieces of the framework such as AssemblyDependencyResolver that won't work without that. We also need hostfxr to find a + // compatible framework for framework-dependent deployed BAs. We had to use hostfxr_initialize_for_dotnet_command_line since + // hostfxr_initialize_for_runtime_config doesn't currently (3.x) support self-contained deployed BAs. That means we're supposed to + // start the runtime through hostfxr_run_app, but that method shuts down the runtime before returning. We actually want to call + // hostfxr_get_runtime_delegate, but that method currently requires hostfxr to be initialized through + // hostfxr_initialize_for_runtime_config. So we're forced to locate coreclr.dll and manually load the runtime ourselves. + + // Unfortunately, that's not the only problem. hostfxr has global state that tracks whether it started the runtime. While we keep our + // hostfxr_handle open, everyone that calls the hostfxr_initialize_* methods will block until we have started the runtime through + // hostfxr or closed our handle. If we close the handle, then hostfxr could potentially try to load a second runtime into the + // process, which is not supported. We're going to just keep our handle open since no one else in the process should be trying to + // start the runtime anyway. + + rc = pState->pfnHostfxrGetRuntimeProperties(pState->hostContextHandle, &cProperties, rgPropertyKeys, rgPropertyValues); + if (HostApiBufferTooSmall != rc) + { + BalExitOnFailure(hr = rc, "HostfxrGetRuntimeProperties failed to return required size."); + } + + rgPropertyKeys = static_cast(MemAlloc(sizeof(LPWSTR) * cProperties, TRUE)); + rgPropertyValues = static_cast(MemAlloc(sizeof(LPWSTR) * cProperties, TRUE)); + if (!rgPropertyKeys || !rgPropertyValues) + { + BalExitOnFailure(hr = E_OUTOFMEMORY, "Failed to allocate buffers for runtime properties."); + } + + hr = pState->pfnHostfxrGetRuntimeProperties(pState->hostContextHandle, &cProperties, rgPropertyKeys, rgPropertyValues); + BalExitOnFailure(hr, "HostfxrGetRuntimeProperties failed."); + + for (DWORD i = 0; i < cProperties; ++i) + { + if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, 0, rgPropertyKeys[i], -1, L"NATIVE_DLL_SEARCH_DIRECTORIES", -1)) + { + hr = StrSplitAllocArray(&rgDirectories, &cDirectories, rgPropertyValues[i], L";"); + BalExitOnFailure(hr, "Failed to split NATIVE_DLL_SEARCH_DIRECTORIES '%ls'", rgPropertyValues[i]); + } + } + + for (DWORD i = 0; i < cDirectories; ++i) + { + hr = PathConcat(rgDirectories[i], L"coreclr.dll", &sczCoreClrPath); + BalExitOnFailure(hr, "Failed to allocate path to coreclr."); + + if (::PathFileExists(sczCoreClrPath)) + { + break; + } + else + { + ReleaseNullStr(sczCoreClrPath); + } + } + + if (!sczCoreClrPath) + { + for (DWORD i = 0; i < cProperties; ++i) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "%ls: %ls", rgPropertyKeys[i], rgPropertyValues[i]); + } + BalExitOnFailure(hr = E_FILENOTFOUND, "Failed to locate coreclr.dll."); + } + + hr = LoadCoreClr(pState, sczCoreClrPath); + BalExitOnFailure(hr, "Failed to load coreclr."); + + hr = StartCoreClr(pState, wzNativeHostPath, (DWORD)cProperties, rgPropertyKeys, rgPropertyValues); + BalExitOnFailure(hr, "Failed to start coreclr."); + +LExit: + MemFree(rgDirectories); + MemFree(rgPropertyValues); + MemFree(rgPropertyKeys); + ReleaseStr(sczCoreClrPath); + + return hr; +} + +static HRESULT LoadCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzCoreClrPath + ) +{ + HRESULT hr = S_OK; + HMODULE hModule = NULL; + + hModule = ::LoadLibraryExW(wzCoreClrPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + BalExitOnNullWithLastError(hModule, hr, "Failed to load coreclr.dll from '%ls'.", wzCoreClrPath); + + pState->pfnCoreclrInitialize = reinterpret_cast(::GetProcAddress(hModule, "coreclr_initialize")); + BalExitOnNullWithLastError(pState->pfnCoreclrInitialize, hr, "Failed to get procedure address for coreclr_initialize."); + + pState->pfnCoreclrCreateDelegate = reinterpret_cast(::GetProcAddress(hModule, "coreclr_create_delegate")); + BalExitOnNullWithLastError(pState->pfnCoreclrCreateDelegate, hr, "Failed to get procedure address for coreclr_create_delegate."); + +LExit: + // Never unload the module since coreclr doesn't support it. + + return hr; +} + +static HRESULT StartCoreClr( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath, + __in DWORD cProperties, + __in LPCWSTR* propertyKeys, + __in LPCWSTR* propertyValues + ) +{ + HRESULT hr = S_OK; + LPSTR szNativeHostPath = NULL; + LPSTR* rgPropertyKeys = NULL; + LPSTR* rgPropertyValues = NULL; + + rgPropertyKeys = static_cast(MemAlloc(sizeof(LPSTR) * cProperties, TRUE)); + rgPropertyValues = static_cast(MemAlloc(sizeof(LPSTR) * cProperties, TRUE)); + if (!rgPropertyKeys || !rgPropertyValues) + { + BalExitOnFailure(hr = E_OUTOFMEMORY, "Failed to allocate buffers for runtime properties."); + } + + hr = StrAnsiAllocString(&szNativeHostPath, wzNativeHostPath, 0, CP_UTF8); + BalExitOnFailure(hr, "Failed to convert module path to UTF8: %ls", wzNativeHostPath); + + for (DWORD i = 0; i < cProperties; ++i) + { + hr = StrAnsiAllocString(&rgPropertyKeys[i], propertyKeys[i], 0, CP_UTF8); + BalExitOnFailure(hr, "Failed to convert property key to UTF8: %ls", propertyKeys[i]); + + hr = StrAnsiAllocString(&rgPropertyValues[i], propertyValues[i], 0, CP_UTF8); + BalExitOnFailure(hr, "Failed to convert property value to UTF8: %ls", propertyValues[i]); + } + + hr = pState->pfnCoreclrInitialize(szNativeHostPath, "MBA", cProperties, (LPCSTR*)rgPropertyKeys, (LPCSTR*)rgPropertyValues, &pState->pClrHandle, &pState->dwDomainId); + BalExitOnFailure(hr, "CoreclrInitialize failed."); + +LExit: + for (DWORD i = 0; i < cProperties; ++i) + { + if (rgPropertyKeys) + { + ReleaseStr(rgPropertyKeys[i]); + } + + if (rgPropertyValues) + { + ReleaseStr(rgPropertyValues[i]); + } + } + ReleaseMem(rgPropertyValues); + ReleaseMem(rgPropertyKeys); + ReleaseStr(szNativeHostPath); + + return hr; +} diff --git a/src/ext/Bal/dnchost/dncutil.h b/src/ext/Bal/dnchost/dncutil.h new file mode 100644 index 00000000..85eda3b2 --- /dev/null +++ b/src/ext/Bal/dnchost/dncutil.h @@ -0,0 +1,38 @@ +#pragma once +// 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. + +typedef IBootstrapperApplicationFactory* (STDMETHODCALLTYPE* PFNCREATEBAFACTORY)( + __in LPCWSTR wzBaFactoryAssemblyName, + __in LPCWSTR wzBaFactoryAssemblyPath + ); + +struct HOSTFXR_STATE +{ + LPWSTR sczHostfxrPath; + hostfxr_handle hostContextHandle; + hostfxr_initialize_for_dotnet_command_line_fn pfnHostfxrInitializeForApp; + hostfxr_get_runtime_properties_fn pfnHostfxrGetRuntimeProperties; + hostfxr_set_error_writer_fn pfnHostfxrSetErrorWriter; + hostfxr_close_fn pfnHostfxrClose; + hostfxr_get_runtime_delegate_fn pfnHostfxrGetRuntimeDelegate; + get_function_pointer_fn pfnGetFunctionPointer; + coreclr_initialize_ptr pfnCoreclrInitialize; + coreclr_create_delegate_ptr pfnCoreclrCreateDelegate; + void* pClrHandle; + UINT dwDomainId; +}; + +HRESULT DnchostLoadRuntime( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzNativeHostPath, + __in LPCWSTR wzManagedHostPath, + __in LPCWSTR wzDepsJsonPath, + __in LPCWSTR wzRuntimeConfigPath + ); + +HRESULT DnchostCreateFactory( + __in HOSTFXR_STATE* pState, + __in LPCWSTR wzBaFactoryAssemblyName, + __in LPCWSTR wzBaFactoryAssemblyPath, + __out IBootstrapperApplicationFactory** ppAppFactory + ); diff --git a/src/ext/Bal/dnchost/packages.config b/src/ext/Bal/dnchost/packages.config new file mode 100644 index 00000000..6c369364 --- /dev/null +++ b/src/ext/Bal/dnchost/packages.config @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/dnchost/precomp.cpp b/src/ext/Bal/dnchost/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/ext/Bal/dnchost/precomp.cpp @@ -0,0 +1,3 @@ +// 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. + +#include "precomp.h" diff --git a/src/ext/Bal/dnchost/precomp.h b/src/ext/Bal/dnchost/precomp.h new file mode 100644 index 00000000..84ff6424 --- /dev/null +++ b/src/ext/Bal/dnchost/precomp.h @@ -0,0 +1,31 @@ +#pragma once +// 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. + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include + +#include +#define NETHOST_USE_AS_STATIC +#include +#include +#include + +#include "coreclrhost.h" +#include "dncutil.h" +#include "dnchost.h" diff --git a/src/ext/Bal/mbahost/mbahost.cpp b/src/ext/Bal/mbahost/mbahost.cpp new file mode 100644 index 00000000..735f9f21 --- /dev/null +++ b/src/ext/Bal/mbahost/mbahost.cpp @@ -0,0 +1,649 @@ +// 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. + +#include "precomp.h" +#include // includes the generated assembly name macros. + +static const DWORD NET452_RELEASE = 379893; + +using namespace mscorlib; + +extern "C" typedef HRESULT (WINAPI *PFN_CORBINDTOCURRENTRUNTIME)( + __in LPCWSTR pwszFileName, + __in REFCLSID rclsid, + __in REFIID riid, + __out LPVOID *ppv + ); + +extern "C" typedef HRESULT(WINAPI *PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE)( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); + +static HINSTANCE vhInstance = NULL; +static ICorRuntimeHost *vpCLRHost = NULL; +static _AppDomain *vpAppDomain = NULL; +static HMODULE vhMbapreqModule = NULL; + + +// internal function declarations + +static HRESULT GetAppDomain( + __out _AppDomain** ppAppDomain + ); +static HRESULT GetAppBase( + __out LPWSTR* psczAppBase + ); +static HRESULT CheckSupportedFrameworks( + __in LPCWSTR wzConfigPath + ); +static HRESULT UpdateSupportedRuntime( + __in IXMLDOMDocument* pixdManifest, + __in IXMLDOMNode* pixnSupportedFramework, + __out BOOL* pfUpdatedManifest + ); +static HRESULT GetCLRHost( + __in LPCWSTR wzConfigPath, + __out ICorRuntimeHost** ppCLRHost + ); +static HRESULT CreateManagedBootstrapperApplication( + __in _AppDomain* pAppDomain, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); +static HRESULT CreateManagedBootstrapperApplicationFactory( + __in _AppDomain* pAppDomain, + __out IBootstrapperApplicationFactory** ppAppFactory + ); +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ); +static HRESULT VerifyNET4RuntimeIsSupported( + ); + + +// function definitions + +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID /* pvReserved */ + ) +{ + switch (dwReason) + { + case DLL_PROCESS_ATTACH: + ::DisableThreadLibraryCalls(hInstance); + vhInstance = hInstance; + break; + + case DLL_PROCESS_DETACH: + vhInstance = NULL; + break; + } + + return TRUE; +} + +// Note: This function assumes that COM was already initialized on the thread. +extern "C" HRESULT WINAPI BootstrapperApplicationCreate( + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + HRESULT hrHostInitialization = S_OK; + IBootstrapperEngine* pEngine = NULL; + + hr = BalInitializeFromCreateArgs(pArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize Bal."); + + hr = GetAppDomain(&vpAppDomain); + if (SUCCEEDED(hr)) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading managed bootstrapper application."); + + hr = CreateManagedBootstrapperApplication(vpAppDomain, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the managed bootstrapper application."); + } + else // fallback to the prerequisite BA. + { + if (E_MBAHOST_NET452_ON_WIN7RTM == hr) + { + BalLogError(hr, "The Burn engine cannot run with an MBA under the .NET 4 CLR on Windows 7 RTM with .NET 4.5.2 (or greater) installed."); + hrHostInitialization = hr; + } + else + { + hrHostInitialization = S_OK; + } + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because managed host could not be loaded, error: 0x%08x.", hr); + + hr = CreatePrerequisiteBA(hrHostInitialization, pEngine, pArgs, pResults); + BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application."); + } + +LExit: + ReleaseNullObject(pEngine); + + return hr; +} + +extern "C" void WINAPI BootstrapperApplicationDestroy() +{ + if (vpAppDomain) + { + HRESULT hr = vpCLRHost->UnloadDomain(vpAppDomain); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to unload app domain."); + } + + vpAppDomain->Release(); + } + + if (vpCLRHost) + { + vpCLRHost->Stop(); + vpCLRHost->Release(); + } + + if (vhMbapreqModule) + { + PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast(::GetProcAddress(vhMbapreqModule, "MbaPrereqBootstrapperApplicationDestroy")); + if (pfnDestroy) + { + (*pfnDestroy)(); + } + + ::FreeLibrary(vhMbapreqModule); + vhMbapreqModule = NULL; + } + + BalUninitialize(); +} + +// Gets the custom AppDomain for loading managed BA. +static HRESULT GetAppDomain( + __out _AppDomain **ppAppDomain + ) +{ + HRESULT hr = S_OK; + ICorRuntimeHost *pCLRHost = NULL; + IUnknown *pUnk = NULL; + LPWSTR sczAppBase = NULL; + LPWSTR sczConfigPath = NULL; + IAppDomainSetup *pAppDomainSetup; + BSTR bstrAppBase = NULL; + BSTR bstrConfigPath = NULL; + + hr = GetAppBase(&sczAppBase); + ExitOnFailure(hr, "Failed to get the host base path."); + + hr = PathConcat(sczAppBase, MBA_CONFIG_FILE_NAME, &sczConfigPath); + ExitOnFailure(hr, "Failed to get the full path to the application configuration file."); + + // Check that the supported framework is installed. + hr = CheckSupportedFrameworks(sczConfigPath); + ExitOnFailure(hr, "Failed to find supported framework."); + + // Load the CLR. + hr = GetCLRHost(sczConfigPath, &pCLRHost); + ExitOnFailure(hr, "Failed to create the CLR host."); + + hr = pCLRHost->Start(); + ExitOnRootFailure(hr, "Failed to start the CLR host."); + + // Create the setup information for a new AppDomain to set the app base and config. + hr = pCLRHost->CreateDomainSetup(&pUnk); + ExitOnRootFailure(hr, "Failed to create the AppDomainSetup object."); + + hr = pUnk->QueryInterface(__uuidof(IAppDomainSetup), reinterpret_cast(&pAppDomainSetup)); + ExitOnRootFailure(hr, "Failed to query for the IAppDomainSetup interface."); + ReleaseNullObject(pUnk); + + // Set properties on the AppDomainSetup object. + bstrAppBase = ::SysAllocString(sczAppBase); + ExitOnNull(bstrAppBase, hr, E_OUTOFMEMORY, "Failed to allocate the application base path for the AppDomainSetup."); + + hr = pAppDomainSetup->put_ApplicationBase(bstrAppBase); + ExitOnRootFailure(hr, "Failed to set the application base path for the AppDomainSetup."); + + bstrConfigPath = ::SysAllocString(sczConfigPath); + ExitOnNull(bstrConfigPath, hr, E_OUTOFMEMORY, "Failed to allocate the application configuration file for the AppDomainSetup."); + + hr = pAppDomainSetup->put_ConfigurationFile(bstrConfigPath); + ExitOnRootFailure(hr, "Failed to set the configuration file path for the AppDomainSetup."); + + // Create the AppDomain to load the factory type. + hr = pCLRHost->CreateDomainEx(L"MBA", pAppDomainSetup, NULL, &pUnk); + ExitOnRootFailure(hr, "Failed to create the MBA AppDomain."); + + hr = pUnk->QueryInterface(__uuidof(_AppDomain), reinterpret_cast(ppAppDomain)); + ExitOnRootFailure(hr, "Failed to query for the _AppDomain interface."); + +LExit: + ReleaseBSTR(bstrConfigPath); + ReleaseBSTR(bstrAppBase); + ReleaseStr(sczConfigPath); + ReleaseStr(sczAppBase); + ReleaseNullObject(pUnk); + ReleaseNullObject(pCLRHost); + + return hr; +} + +static HRESULT GetAppBase( + __out LPWSTR *psczAppBase + ) +{ + HRESULT hr = S_OK; + LPWSTR sczFullPath = NULL; + + hr = PathForCurrentProcess(&sczFullPath, vhInstance); + ExitOnFailure(hr, "Failed to get the full host path."); + + hr = PathGetDirectory(sczFullPath, psczAppBase); + ExitOnFailure(hr, "Failed to get the directory of the full process path."); + +LExit: + ReleaseStr(sczFullPath); + + return hr; +} + +// Checks whether at least one of required supported frameworks is installed via the NETFX registry keys. +static HRESULT CheckSupportedFrameworks( + __in LPCWSTR wzConfigPath + ) +{ + HRESULT hr = S_OK; + IXMLDOMDocument* pixdManifest = NULL; + IXMLDOMNodeList* pNodeList = NULL; + IXMLDOMNode* pNode = NULL; + DWORD cSupportedFrameworks = 0; + LPWSTR sczSupportedFrameworkVersion = NULL; + LPWSTR sczFrameworkRegistryKey = NULL; + HKEY hkFramework = NULL; + DWORD dwFrameworkInstalled = 0; + BOOL fUpdatedManifest = FALSE; + + hr = XmlInitialize(); + ExitOnFailure(hr, "Failed to initialize XML."); + + hr = XmlLoadDocumentFromFile(wzConfigPath, &pixdManifest); + ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); + + hr = XmlSelectNodes(pixdManifest, L"/configuration/wix.bootstrapper/host/supportedFramework", &pNodeList); + ExitOnFailure(hr, "Failed to select all supportedFramework elements."); + + hr = pNodeList->get_length(reinterpret_cast(&cSupportedFrameworks)); + ExitOnFailure(hr, "Failed to get the supported framework count."); + + if (cSupportedFrameworks) + { + while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL))) + { + hr = XmlGetAttributeEx(pNode, L"version", &sczSupportedFrameworkVersion); + ExitOnFailure(hr, "Failed to get supportedFramework/@version."); + + hr = StrAllocFormatted(&sczFrameworkRegistryKey, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\%ls", sczSupportedFrameworkVersion); + ExitOnFailure(hr, "Failed to allocate path to supported framework Install registry key."); + + hr = RegOpen(HKEY_LOCAL_MACHINE, sczFrameworkRegistryKey, KEY_READ, &hkFramework); + if (SUCCEEDED(hr)) + { + hr = RegReadNumber(hkFramework, L"Install", &dwFrameworkInstalled); + if (dwFrameworkInstalled) + { + hr = S_OK; + break; + } + } + + ReleaseNullObject(pNode); + } + + // If we looped through all the supported frameworks but didn't find anything, ensure we return a failure. + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + ExitOnRootFailure(hr, "Failed to find a supported framework."); + } + + hr = UpdateSupportedRuntime(pixdManifest, pNode, &fUpdatedManifest); + ExitOnFailure(hr, "Failed to update supportedRuntime."); + } + // else no supported frameworks specified, so the startup/supportedRuntime must be enough. + + if (fUpdatedManifest) + { + hr = XmlSaveDocument(pixdManifest, wzConfigPath); + ExitOnFailure(hr, "Failed to save updated manifest over config file: %ls", wzConfigPath); + } + +LExit: + ReleaseRegKey(hkFramework); + ReleaseStr(sczFrameworkRegistryKey); + ReleaseStr(sczSupportedFrameworkVersion); + ReleaseObject(pNode); + ReleaseObject(pNodeList); + ReleaseObject(pixdManifest); + + XmlUninitialize(); + + return hr; +} + +// Fixes the supportedRuntime element if necessary. +static HRESULT UpdateSupportedRuntime( + __in IXMLDOMDocument* pixdManifest, + __in IXMLDOMNode* pixnSupportedFramework, + __out BOOL* pfUpdatedManifest + ) +{ + HRESULT hr = S_OK; + LPWSTR sczSupportedRuntimeVersion = NULL; + IXMLDOMNode* pixnStartup = NULL; + IXMLDOMNode* pixnSupportedRuntime = NULL; + + *pfUpdatedManifest = FALSE; + + // If the runtime version attribute is not specified, don't update the manifest. + hr = XmlGetAttributeEx(pixnSupportedFramework, L"runtimeVersion", &sczSupportedRuntimeVersion); + if (E_NOTFOUND == hr) + { + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to get supportedFramework/@runtimeVersion."); + + // Get the startup element. Fail if we can't find it since it'll be necessary to load the + // correct runtime. + hr = XmlSelectSingleNode(pixdManifest, L"/configuration/startup", &pixnStartup); + ExitOnFailure(hr, "Failed to get startup element."); + + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + ExitOnRootFailure(hr, "Failed to find startup element in bootstrapper application config."); + } + + // Remove any pre-existing supported runtimes because they'll just get in the way and create our new one. + hr = XmlRemoveChildren(pixnStartup, L"supportedRuntime"); + ExitOnFailure(hr, "Failed to remove pre-existing supportedRuntime elements."); + + hr = XmlCreateChild(pixnStartup, L"supportedRuntime", &pixnSupportedRuntime); + ExitOnFailure(hr, "Failed to create supportedRuntime element."); + + hr = XmlSetAttribute(pixnSupportedRuntime, L"version", sczSupportedRuntimeVersion); + ExitOnFailure(hr, "Failed to set supportedRuntime/@version to '%ls'.", sczSupportedRuntimeVersion); + + *pfUpdatedManifest = TRUE; + +LExit: + ReleaseObject(pixnSupportedRuntime); + ReleaseObject(pixnStartup); + ReleaseStr(sczSupportedRuntimeVersion); + + return hr; +} + +// Gets the CLR host and caches it. +static HRESULT GetCLRHost( + __in LPCWSTR wzConfigPath, + __out ICorRuntimeHost **ppCLRHost + ) +{ + HRESULT hr = S_OK; + UINT uiMode = 0; + HMODULE hModule = NULL; + BOOL fFallbackToCorBindToCurrentRuntime = TRUE; + CLRCreateInstanceFnPtr pfnCLRCreateInstance = NULL; + ICLRMetaHostPolicy* pCLRMetaHostPolicy = NULL; + IStream* pCfgStream = NULL; + LPWSTR pwzVersion = NULL; + DWORD cchVersion = 0; + DWORD dwConfigFlags = 0; + ICLRRuntimeInfo* pCLRRuntimeInfo = NULL; + PFN_CORBINDTOCURRENTRUNTIME pfnCorBindToCurrentRuntime = NULL; + + // Always set the error mode because we will always restore it below. + uiMode = ::SetErrorMode(0); + + // Cache the CLR host to be shutdown later. This can occur on a different thread. + if (!vpCLRHost) + { + // Disable message boxes from being displayed on error and blocking execution. + ::SetErrorMode(uiMode | SEM_FAILCRITICALERRORS); + + hr = LoadSystemLibrary(L"mscoree.dll", &hModule); + ExitOnFailure(hr, "Failed to load mscoree.dll"); + + pfnCLRCreateInstance = reinterpret_cast(::GetProcAddress(hModule, "CLRCreateInstance")); + + if (pfnCLRCreateInstance) + { + hr = pfnCLRCreateInstance(CLSID_CLRMetaHostPolicy, IID_ICLRMetaHostPolicy, reinterpret_cast(&pCLRMetaHostPolicy)); + if (E_NOTIMPL != hr) + { + ExitOnRootFailure(hr, "Failed to create instance of ICLRMetaHostPolicy."); + + fFallbackToCorBindToCurrentRuntime = FALSE; + } + } + + if (fFallbackToCorBindToCurrentRuntime) + { + pfnCorBindToCurrentRuntime = reinterpret_cast(::GetProcAddress(hModule, "CorBindToCurrentRuntime")); + ExitOnNullWithLastError(pfnCorBindToCurrentRuntime, hr, "Failed to get procedure address for CorBindToCurrentRuntime."); + + hr = pfnCorBindToCurrentRuntime(wzConfigPath, CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); + ExitOnRootFailure(hr, "Failed to create the CLR host using the application configuration file path."); + } + else + { + + hr = SHCreateStreamOnFileEx(wzConfigPath, STGM_READ | STGM_SHARE_DENY_WRITE, 0, FALSE, NULL, &pCfgStream); + ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); + + hr = pCLRMetaHostPolicy->GetRequestedRuntime(METAHOST_POLICY_HIGHCOMPAT, NULL, pCfgStream, NULL, &cchVersion, NULL, NULL, &dwConfigFlags, IID_ICLRRuntimeInfo, reinterpret_cast(&pCLRRuntimeInfo)); + ExitOnRootFailure(hr, "Failed to get the CLR runtime info using the application configuration file path."); + + // .NET 4 RTM had a bug where it wouldn't set pcchVersion if pwzVersion was NULL. + if (!cchVersion) + { + hr = pCLRRuntimeInfo->GetVersionString(NULL, &cchVersion); + if (HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) != hr) + { + ExitOnFailure(hr, "Failed to get the length of the CLR version string."); + } + } + + hr = StrAlloc(&pwzVersion, cchVersion); + ExitOnFailure(hr, "Failed to allocate the CLR version string."); + + hr = pCLRRuntimeInfo->GetVersionString(pwzVersion, &cchVersion); + ExitOnFailure(hr, "Failed to get the CLR version string."); + + if (CSTR_EQUAL == CompareString(LOCALE_NEUTRAL, 0, L"v4.0.30319", -1, pwzVersion, cchVersion)) + { + hr = VerifyNET4RuntimeIsSupported(); + ExitOnFailure(hr, "Found unsupported .NET 4 Runtime."); + } + + if (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_TRUE == (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_MASK & dwConfigFlags)) + { + hr = pCLRRuntimeInfo->BindAsLegacyV2Runtime(); + ExitOnRootFailure(hr, "Failed to bind as legacy V2 runtime."); + } + + hr = pCLRRuntimeInfo->GetInterface(CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); + ExitOnRootFailure(hr, "Failed to get instance of ICorRuntimeHost."); + + // TODO: use ICLRRuntimeHost instead of ICorRuntimeHost on .NET 4 since the former is faster and the latter is deprecated + //hr = pCLRRuntimeInfo->GetInterface(CLSID_CLRRuntimeHost, IID_ICLRRuntimeHost, reinterpret_cast(&pCLRRuntimeHost)); + //ExitOnRootFailure(hr, "Failed to get instance of ICLRRuntimeHost."); + } + } + + vpCLRHost->AddRef(); + *ppCLRHost = vpCLRHost; + +LExit: + ReleaseStr(pwzVersion); + ReleaseNullObject(pCLRRuntimeInfo); + ReleaseNullObject(pCfgStream); + ReleaseNullObject(pCLRMetaHostPolicy); + + // Unload the module so it's not in use when we install .NET. + if (FAILED(hr)) + { + ::FreeLibrary(hModule); + } + + ::SetErrorMode(uiMode); // restore the previous error mode. + + return hr; +} + +// Creates the bootstrapper app and returns it for the engine. +static HRESULT CreateManagedBootstrapperApplication( + __in _AppDomain* pAppDomain, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + IBootstrapperApplicationFactory* pAppFactory = NULL; + + hr = CreateManagedBootstrapperApplicationFactory(pAppDomain, &pAppFactory); + ExitOnFailure(hr, "Failed to create the factory to create the bootstrapper application."); + + hr = pAppFactory->Create(pArgs, pResults); + ExitOnFailure(hr, "Failed to create the bootstrapper application."); + +LExit: + ReleaseNullObject(pAppFactory); + + return hr; +} + +// Creates the app factory to create the managed app in the default AppDomain. +static HRESULT CreateManagedBootstrapperApplicationFactory( + __in _AppDomain* pAppDomain, + __out IBootstrapperApplicationFactory** ppAppFactory + ) +{ + HRESULT hr = S_OK; + BSTR bstrAssemblyName = NULL; + BSTR bstrTypeName = NULL; + _ObjectHandle* pObj = NULL; + VARIANT vtBAFactory; + + ::VariantInit(&vtBAFactory); + + bstrAssemblyName = ::SysAllocString(MBA_ASSEMBLY_FULL_NAME); + ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory."); + + bstrTypeName = ::SysAllocString(MBA_ENTRY_TYPE); + ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory."); + + hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj); + ExitOnRootFailure(hr, "Failed to create the BA factory object."); + + hr = pObj->Unwrap(&vtBAFactory); + ExitOnRootFailure(hr, "Failed to unwrap the BA factory object into the host domain."); + ExitOnNull(vtBAFactory.punkVal, hr, E_UNEXPECTED, "The variant did not contain the expected IUnknown pointer."); + + hr = vtBAFactory.punkVal->QueryInterface(__uuidof(IBootstrapperApplicationFactory), reinterpret_cast(ppAppFactory)); + ExitOnRootFailure(hr, "Failed to query for the bootstrapper app factory interface."); + +LExit: + ReleaseVariant(vtBAFactory); + ReleaseNullObject(pObj); + ReleaseBSTR(bstrTypeName); + ReleaseBSTR(bstrAssemblyName); + + return hr; +} + +static HRESULT CreatePrerequisiteBA( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + LPWSTR sczMbapreqPath = NULL; + HMODULE hModule = NULL; + + hr = PathRelativeToModule(&sczMbapreqPath, L"mbapreq.dll", vhInstance); + ExitOnFailure(hr, "Failed to get path to pre-requisite BA."); + + hModule = ::LoadLibraryW(sczMbapreqPath); + ExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL."); + + PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast(::GetProcAddress(hModule, "MbaPrereqBootstrapperApplicationCreate")); + ExitOnNullWithLastError(pfnCreate, hr, "Failed to get MbaPrereqBootstrapperApplicationCreate entry-point from: %ls", sczMbapreqPath); + + hr = pfnCreate(hrHostInitialization, pEngine, pArgs, pResults); + ExitOnFailure(hr, "Failed to create prequisite bootstrapper app."); + + vhMbapreqModule = hModule; + hModule = NULL; + +LExit: + if (hModule) + { + ::FreeLibrary(hModule); + } + ReleaseStr(sczMbapreqPath); + + return hr; +} + +static HRESULT VerifyNET4RuntimeIsSupported( + ) +{ + HRESULT hr = S_OK; + OS_VERSION osv = OS_VERSION_UNKNOWN; + DWORD dwServicePack = 0; + HKEY hKey = NULL; + DWORD er = ERROR_SUCCESS; + DWORD dwRelease = 0; + DWORD cchRelease = sizeof(dwRelease); + + OsGetVersion(&osv, &dwServicePack); + if (OS_VERSION_WIN7 == osv && 0 == dwServicePack) + { + hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", KEY_QUERY_VALUE, &hKey); + if (E_FILENOTFOUND == hr) + { + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to open registry key for .NET 4."); + + er = ::RegQueryValueExW(hKey, L"Release", NULL, NULL, reinterpret_cast(&dwRelease), &cchRelease); + if (ERROR_FILE_NOT_FOUND == er) + { + ExitFunction1(hr = S_OK); + } + ExitOnWin32Error(er, hr, "Failed to get Release value."); + + if (NET452_RELEASE <= dwRelease) + { + hr = E_MBAHOST_NET452_ON_WIN7RTM; + } + } + +LExit: + ReleaseRegKey(hKey); + + return hr; +} diff --git a/src/ext/Bal/mbahost/mbahost.def b/src/ext/Bal/mbahost/mbahost.def new file mode 100644 index 00000000..4488df94 --- /dev/null +++ b/src/ext/Bal/mbahost/mbahost.def @@ -0,0 +1,6 @@ +; 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. + + +EXPORTS + BootstrapperApplicationCreate + BootstrapperApplicationDestroy diff --git a/src/ext/Bal/mbahost/mbahost.vcxproj b/src/ext/Bal/mbahost/mbahost.vcxproj new file mode 100644 index 00000000..6457b4e0 --- /dev/null +++ b/src/ext/Bal/mbahost/mbahost.vcxproj @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + {12C87C77-3547-44F8-8134-29BC915CB19D} + DynamicLibrary + v142 + Unicode + mbahost + mbahost.def + + + + + + + shlwapi.lib + + + + + + Create + + + + + + + + + + + + + + + + $(BaseOutputPath)obj;%(AdditionalIncludeDirectories) + + + + + + {f2ba1935-70fa-4156-b161-fd03850b4faa} + false + true + + + + + + + + + + + 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/ext/Bal/mbahost/packages.config b/src/ext/Bal/mbahost/packages.config new file mode 100644 index 00000000..071284ac --- /dev/null +++ b/src/ext/Bal/mbahost/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/mbahost/precomp.cpp b/src/ext/Bal/mbahost/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/ext/Bal/mbahost/precomp.cpp @@ -0,0 +1,3 @@ +// 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. + +#include "precomp.h" diff --git a/src/ext/Bal/mbahost/precomp.h b/src/ext/Bal/mbahost/precomp.h new file mode 100644 index 00000000..d29a23f3 --- /dev/null +++ b/src/ext/Bal/mbahost/precomp.h @@ -0,0 +1,25 @@ +#pragma once +// 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. + + +#include +#include +#include +#include + +#import raw_interfaces_only rename("ReportEvent", "mscorlib_ReportEvent") + +#include +#include +#include +#include +#include +#include + +#include "BootstrapperEngine.h" +#include "BootstrapperApplication.h" +#include "IBootstrapperEngine.h" +#include "IBootstrapperApplication.h" +#include "IBootstrapperApplicationFactory.h" + +#include "balutil.h" diff --git a/src/ext/Bal/nuget.config b/src/ext/Bal/nuget.config new file mode 100644 index 00000000..f3277bc4 --- /dev/null +++ b/src/ext/Bal/nuget.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs new file mode 100644 index 00000000..2ff57c55 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.Bal/BalExtensionFixture.cs @@ -0,0 +1,133 @@ +// 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. + +namespace WixToolsetTest.Bal +{ + using System.IO; + using System.Linq; + using System.Xml; + using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; + using Xunit; + + public class BalExtensionFixture + { + [Fact] + public void CanBuildUsingDisplayInternalUICondition() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "DisplayInternalUIConditionBundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-bindpath", Path.Combine(bundleSourceFolder, "data"), + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balPackageInfos = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); + var balPackageInfo = (XmlNode)Assert.Single(balPackageInfos); + Assert.Equal("", balPackageInfo.GetTestXml()); + + Assert.True(File.Exists(Path.Combine(baFolderPath, "thm.wxl"))); + } + } + + [Fact] + public void CanBuildUsingOverridable() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\Overridable"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + var baFolderPath = Path.Combine(baseFolder, "ba"); + var extractFolderPath = Path.Combine(baseFolder, "extract"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var balOverridableVariables = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixStdbaOverridableVariable"); + var balOverridableVariable = (XmlNode)Assert.Single(balOverridableVariables); + Assert.Equal("", balOverridableVariable.GetTestXml()); + } + } + + [Fact] + public void CanBuildUsingWixStdBa() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", bundleFile, + }); + compileResult.AssertSuccess(); + + Assert.True(File.Exists(bundleFile)); + } + } + + [Fact] + public void CantBuildUsingMBAWithNoPrereqs() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); + var bundleSourceFolder = TestData.Get(@"TestData\MBA"); + var intermediateFolder = Path.Combine(baseFolder, "obj"); + + var compileResult = WixRunner.Execute(new[] + { + "build", + Path.Combine(bundleSourceFolder, "Bundle.wxs"), + "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), + "-intermediateFolder", intermediateFolder, + "-o", bundleFile, + }); + Assert.Equal(6802, compileResult.ExitCode); + Assert.Equal("There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString()); + + Assert.False(File.Exists(bundleFile)); + Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); + } + } + } +} diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs new file mode 100644 index 00000000..ba1aefba --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs new file mode 100644 index 00000000..91380c69 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs @@ -0,0 +1,13 @@ + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs new file mode 100644 index 00000000..c17b53ff --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi new file mode 100644 index 00000000..94aacd1a Binary files /dev/null and b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi differ diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs new file mode 100644 index 00000000..f08cfe6a --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs @@ -0,0 +1,12 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj new file mode 100644 index 00000000..c9ab4219 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj @@ -0,0 +1,43 @@ + + + + + + netcoreapp3.1 + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject new file mode 100644 index 00000000..7b5b2139 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject @@ -0,0 +1,5 @@ + + + True + + \ No newline at end of file diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs new file mode 100644 index 00000000..af5f2543 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/DncHostFixture.cs @@ -0,0 +1,209 @@ +// 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. + +namespace WixToolsetTest.ManagedHost +{ + using System.IO; + using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; + using Xunit; + + public class DncHostFixture + { + static readonly string bundleBasePath = TestData.Get("..", "examples"); + + [Fact] + public void CanLoadFDDEarliestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleFDD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("EarliestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanLoadSCDEarliestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleSCD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("EarliestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanLoadTrimmedSCDEarliestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleTrimmedSCD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("EarliestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanReloadSCDEarliestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleSCD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("EarliestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[4]); + Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]); + Assert.Equal("EarliestCoreBA", logMessages[7]); + Assert.Equal("Shutdown,Restart,0", logMessages[8]); + } + } + + [Fact] + public void CanLoadFDDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanReloadFDDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[4]); + Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]); + Assert.Equal("LatestCoreBA", logMessages[7]); + Assert.Equal("Shutdown,Restart,0", logMessages[8]); + } + } + + [Fact] + public void CanLoadSCDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleSCD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanLoadTrimmedSCDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleTrimmedSCD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanReloadSCDLatestCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleSCD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("LatestCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[4]); + Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]); + Assert.Equal("LatestCoreBA", logMessages[7]); + Assert.Equal("Shutdown,Restart,0", logMessages[8]); + } + } + + [Fact] + public void CanLoadFDDWPFCoreMBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "WPFCoreBundleFDD.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("WPFCoreBA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + } +} diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs new file mode 100644 index 00000000..dd37ee58 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs @@ -0,0 +1,94 @@ +// 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. + +namespace WixToolsetTest.ManagedHost +{ + using System.IO; + using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; + using Xunit; + + public class MbaHostFixture + { + static readonly string bundleBasePath = TestData.Get("..", "examples"); + + [Fact] + public void CanLoadFullFramework2MBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "FullFramework2Bundle.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("FullFramework2BA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanLoadFullFramework4MBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "FullFramework4Bundle.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("FullFramework4BA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + } + } + + [Fact] + public void CanReloadFullFramework2MBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "FullFramework2Bundle.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("FullFramework2BA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading managed bootstrapper application.", logMessages[4]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]); + Assert.Equal("FullFramework2BA", logMessages[6]); + Assert.Equal("Shutdown,Restart,0", logMessages[7]); + } + } + + [Fact] + public void CanReloadFullFramework4MBA() + { + using (var fs = new DisposableFileSystem()) + { + var baseFolder = fs.GetFolder(); + var bundleFile = TestData.Get(bundleBasePath, "FullFramework4Bundle.exe"); + var testEngine = new TestEngine(); + + var result = testEngine.RunReloadEngine(bundleFile, baseFolder); + var logMessages = result.Output; + Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); + Assert.Equal("FullFramework4BA", logMessages[2]); + Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); + Assert.Equal("Loading managed bootstrapper application.", logMessages[4]); + Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]); + Assert.Equal("FullFramework4BA", logMessages[6]); + Assert.Equal("Shutdown,Restart,0", logMessages[7]); + } + } + } +} diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/README.md b/src/ext/Bal/test/WixToolsetTest.ManagedHost/README.md new file mode 100644 index 00000000..d7e73df2 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/README.md @@ -0,0 +1,5 @@ +In order to properly test dnchost and mbahost, +the managed BAs need to be published and a bundle needs to be built for each scenario. +Making this happen on every build for the solution takes too long, +so this project relies on manually running appveyor.cmd to publish everything before the tests can be run. +appveyor.cmd needs to be ran again every time changes are made in other projects. \ No newline at end of file diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs new file mode 100644 index 00000000..44538227 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngine.cs @@ -0,0 +1,74 @@ +// 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. + +namespace WixToolsetTest.ManagedHost +{ + using System.Collections.Generic; + using System.Diagnostics; + using System.IO; + using WixBuildTools.TestSupport; + using WixToolset.Core.TestPackage; + + public class TestEngine + { + private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); + + public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) + { + return this.RunTestEngine("reload", bundleFilePath, tempFolderPath); + } + + public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath) + { + return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath); + } + + private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath) + { + var baFolderPath = Path.Combine(tempFolderPath, "ba"); + var extractFolderPath = Path.Combine(tempFolderPath, "extract"); + var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFilePath, baFolderPath, extractFolderPath); + extractResult.AssertSuccess(); + + var args = new string[] { + engineMode, + '"' + bundleFilePath + '"', + '"' + extractResult.GetBAFilePath(baFolderPath) + '"', + }; + return RunProcessCaptureOutput(TestEngineFile, args); + } + + private static TestEngineResult RunProcessCaptureOutput(string executablePath, string[] arguments = null, string workingFolder = null) + { + var startInfo = new ProcessStartInfo(executablePath) + { + Arguments = string.Join(' ', arguments), + CreateNoWindow = true, + RedirectStandardError = true, + RedirectStandardOutput = true, + UseShellExecute = false, + WorkingDirectory = workingFolder, + }; + + var exitCode = 0; + var output = new List(); + + using (var process = Process.Start(startInfo)) + { + process.OutputDataReceived += (s, e) => { if (e.Data != null) { output.Add(e.Data); } }; + process.ErrorDataReceived += (s, e) => { if (e.Data != null) { output.Add(e.Data); } }; + + process.BeginErrorReadLine(); + process.BeginOutputReadLine(); + + process.WaitForExit(); + exitCode = process.ExitCode; + } + + return new TestEngineResult + { + ExitCode = exitCode, + Output = output, + }; + } + } +} diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngineResult.cs b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngineResult.cs new file mode 100644 index 00000000..63f6f7f5 --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/TestEngineResult.cs @@ -0,0 +1,12 @@ +// 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. + +namespace WixToolsetTest.ManagedHost +{ + using System.Collections.Generic; + + public class TestEngineResult + { + public int ExitCode { get; set; } + public List Output { get; set; } + } +} diff --git a/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj new file mode 100644 index 00000000..38c8926c --- /dev/null +++ b/src/ext/Bal/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj @@ -0,0 +1,25 @@ + + + + + + netcoreapp3.1 + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/Directory.Build.props b/src/ext/Bal/test/examples/Directory.Build.props new file mode 100644 index 00000000..3d5870a5 --- /dev/null +++ b/src/ext/Bal/test/examples/Directory.Build.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ext/Bal/test/examples/Directory.Build.targets b/src/ext/Bal/test/examples/Directory.Build.targets new file mode 100644 index 00000000..6dcf402b --- /dev/null +++ b/src/ext/Bal/test/examples/Directory.Build.targets @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..d146845c --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj new file mode 100644 index 00000000..ebeebff2 --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.EarliestCoreMBA.scd + ba.xslt + + + diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs new file mode 100644 index 00000000..4d872317 --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt new file mode 100644 index 00000000..06b84256 --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj new file mode 100644 index 00000000..a6b56460 --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.EarliestCoreMBA.trimmedscd + ba.xslt + + + diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs new file mode 100644 index 00000000..ba7dce25 --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt new file mode 100644 index 00000000..06b84256 --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs new file mode 100644 index 00000000..c9291a7f --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBA.cs @@ -0,0 +1,34 @@ +// 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. + +namespace Example.EarliestCoreMBA +{ + using WixToolset.Mba.Core; + + public class EarliestCoreBA : BootstrapperApplication + { + public EarliestCoreBA(IEngine engine) + : base(engine) + { + + } + + protected override void Run() + { + } + + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(EarliestCoreBA)); + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs new file mode 100644 index 00000000..672e17ee --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs @@ -0,0 +1,22 @@ +// 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. + +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.EarliestCoreMBA.EarliestCoreBAFactory))] +namespace Example.EarliestCoreMBA +{ + using WixToolset.Mba.Core; + + public class EarliestCoreBAFactory : BaseBootstrapperApplicationFactory + { + private static int loadCount = 0; + + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; + return new EarliestCoreBA(engine); + } + } +} diff --git a/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj new file mode 100644 index 00000000..cb66c138 --- /dev/null +++ b/src/ext/Bal/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj @@ -0,0 +1,18 @@ + + + + netcoreapp3.1 + win-x86;win-x64 + true + Earliest .NET Core MBA + + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs new file mode 100644 index 00000000..f0af975c --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework2Bundle/Bundle.wxs @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj b/src/ext/Bal/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj new file mode 100644 index 00000000..21079ed1 --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj @@ -0,0 +1,20 @@ + + + + + + net20 + Example.FullFramework2MBA + Example.FullFramework2MBA + embedded + win-x86 + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs new file mode 100644 index 00000000..32cd19c8 --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BA.cs @@ -0,0 +1,34 @@ +// 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. + +namespace Example.FullFramework2MBA +{ + using WixToolset.Mba.Core; + + public class FullFramework2BA : BootstrapperApplication + { + public FullFramework2BA(IEngine engine) + : base(engine) + { + + } + + protected override void Run() + { + } + + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(FullFramework2BA)); + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs new file mode 100644 index 00000000..647c2040 --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs @@ -0,0 +1,22 @@ +// 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. + +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))] +namespace Example.FullFramework2MBA +{ + using WixToolset.Mba.Core; + + public class FullFramework2BAFactory : BaseBootstrapperApplicationFactory + { + private static int loadCount = 0; + + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; + return new FullFramework2BA(engine); + } + } +} diff --git a/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config b/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config new file mode 100644 index 00000000..be450a4f --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config @@ -0,0 +1,20 @@ + + + + + + + +
+ + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs new file mode 100644 index 00000000..7b7cbf57 --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework4Bundle/Bundle.wxs @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj b/src/ext/Bal/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj new file mode 100644 index 00000000..a05e7888 --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj @@ -0,0 +1,19 @@ + + + + + + net48 + Full Framework v4 MBA + win-x86 + + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs new file mode 100644 index 00000000..8ee3bd19 --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BA.cs @@ -0,0 +1,34 @@ +// 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. + +namespace Example.FullFramework4MBA +{ + using WixToolset.Mba.Core; + + public class FullFramework4BA : BootstrapperApplication + { + public FullFramework4BA(IEngine engine) + : base(engine) + { + + } + + protected override void Run() + { + } + + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(FullFramework4BA)); + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs new file mode 100644 index 00000000..6a571a54 --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs @@ -0,0 +1,22 @@ +// 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. + +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework4MBA.FullFramework4BAFactory))] +namespace Example.FullFramework4MBA +{ + using WixToolset.Mba.Core; + + public class FullFramework4BAFactory : BaseBootstrapperApplicationFactory + { + private static int loadCount = 0; + + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; + return new FullFramework4BA(engine); + } + } +} diff --git a/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config b/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config new file mode 100644 index 00000000..96678cda --- /dev/null +++ b/src/ext/Bal/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config @@ -0,0 +1,17 @@ + + + + + + + +
+ + + + + + + + + diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..d5b543e8 --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj new file mode 100644 index 00000000..30a860ab --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.LatestCoreMBA.scd + ba.xslt + + + diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs new file mode 100644 index 00000000..bedf0326 --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt b/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt new file mode 100644 index 00000000..acc7474c --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreBundleSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj new file mode 100644 index 00000000..5ce89b64 --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj @@ -0,0 +1,10 @@ + + + + + + publish.Example.LatestCoreMBA.trimmedscd + ba.xslt + + + diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs new file mode 100644 index 00000000..6059f8c1 --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt new file mode 100644 index 00000000..acc7474c --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt @@ -0,0 +1,20 @@ + + + + + + + + + + + + + yes + + + + diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj new file mode 100644 index 00000000..9f3f02d9 --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj @@ -0,0 +1,21 @@ + + + + net5.0 + win-x86;win-x64 + true + Latest .NET Core MBA + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs new file mode 100644 index 00000000..50386a87 --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBA.cs @@ -0,0 +1,33 @@ +// 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. + +namespace Example.LatestCoreMBA +{ + using WixToolset.Mba.Core; + + public class LatestCoreBA : BootstrapperApplication + { + public LatestCoreBA(IEngine engine) + : base(engine) + { + } + + protected override void Run() + { + } + + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(LatestCoreBA)); + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs new file mode 100644 index 00000000..fff3b5c5 --- /dev/null +++ b/src/ext/Bal/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs @@ -0,0 +1,22 @@ +// 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. + +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.LatestCoreMBA.LatestCoreBAFactory))] +namespace Example.LatestCoreMBA +{ + using WixToolset.Mba.Core; + + public class LatestCoreBAFactory : BaseBootstrapperApplicationFactory + { + private static int loadCount = 0; + + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; + return new LatestCoreBA(engine); + } + } +} diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj new file mode 100644 index 00000000..99eb917e --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj @@ -0,0 +1,83 @@ + + + + + + + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + {3D44B67D-A475-49BA-8310-E39F6C117CC9} + Application + Console + Example.TestEngine + v142 + Unicode + 10.0 + + + + + + + + + + + + + + + Create + + + + + + + + + + + + + + + + + + + + + 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/ext/Bal/test/examples/TestEngine/ExampleTestEngine.cpp b/src/ext/Bal/test/examples/TestEngine/ExampleTestEngine.cpp new file mode 100644 index 00000000..fc1938fe --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/ExampleTestEngine.cpp @@ -0,0 +1,53 @@ +// 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. + +#include "precomp.h" + +int __cdecl wmain(int argc, LPWSTR argv[]) +{ + HRESULT hr = S_OK; + BOOL fComInitialized = FALSE; + BOOL fShowUsage = FALSE; + + // initialize COM + hr = ::CoInitializeEx(NULL, COINIT_MULTITHREADED); + ExitOnFailure(hr, "Failed to initialize COM."); + fComInitialized = TRUE; + + ConsoleInitialize(); + + if (argc != 4) + { + fShowUsage = TRUE; + } + else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"reload", -1)) + { + hr = RunReloadEngine(argv[2], argv[3]); + } + else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"shutdown", -1)) + { + hr = RunShutdownEngine(argv[2], argv[3]); + } + else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"waitforquit", -1)) + { + hr = RunWaitForQuitEngine(argv[2], argv[3]); + } + else + { + fShowUsage = TRUE; + } + + if (fShowUsage) + { + ConsoleWriteError(hr = E_INVALIDARG, CONSOLE_COLOR_RED, "Usage: Example.TestEngine.exe {reload|shutdown|waitforquit} Bundle.exe BA.dll"); + } + + ConsoleUninitialize(); + +LExit: + if (fComInitialized) + { + ::CoUninitialize(); + } + + return hr; +} diff --git a/src/ext/Bal/test/examples/TestEngine/ReloadEngine.cpp b/src/ext/Bal/test/examples/TestEngine/ReloadEngine.cpp new file mode 100644 index 00000000..46fd9afa --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/ReloadEngine.cpp @@ -0,0 +1,55 @@ +// 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. + +#include "precomp.h" + +HRESULT RunReloadEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ) +{ + HRESULT hr = S_OK; + TestEngine* pTestEngine = NULL; + + pTestEngine = new TestEngine(); + ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); + + hr = pTestEngine->Initialize(wzBundleFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine."); + + hr = pTestEngine->LoadBA(wzBAFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); + + hr = pTestEngine->SendStartupEvent(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + + hr = pTestEngine->SimulateQuit(0); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit."); + + hr = pTestEngine->RunApplication(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); + + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); + + pTestEngine->UnloadBA(); + + hr = pTestEngine->LoadBA(wzBAFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); + + hr = pTestEngine->SendStartupEvent(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + + hr = pTestEngine->SimulateQuit(0); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit."); + + hr = pTestEngine->RunApplication(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); + + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); + + pTestEngine->UnloadBA(); + +LExit: + return hr; +} diff --git a/src/ext/Bal/test/examples/TestEngine/ReloadEngine.h b/src/ext/Bal/test/examples/TestEngine/ReloadEngine.h new file mode 100644 index 00000000..0e8456af --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/ReloadEngine.h @@ -0,0 +1,8 @@ +#pragma once +// 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. + + +HRESULT RunReloadEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ); diff --git a/src/ext/Bal/test/examples/TestEngine/ShutdownEngine.cpp b/src/ext/Bal/test/examples/TestEngine/ShutdownEngine.cpp new file mode 100644 index 00000000..3b876e4e --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/ShutdownEngine.cpp @@ -0,0 +1,38 @@ +// 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. + +#include "precomp.h" + +HRESULT RunShutdownEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ) +{ + HRESULT hr = S_OK; + TestEngine* pTestEngine = NULL; + + pTestEngine = new TestEngine(); + ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); + + hr = pTestEngine->Initialize(wzBundleFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine."); + + hr = pTestEngine->LoadBA(wzBAFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); + + hr = pTestEngine->SendStartupEvent(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + + hr = pTestEngine->SimulateQuit(0); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit."); + + hr = pTestEngine->RunApplication(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); + + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); + + pTestEngine->UnloadBA(); + +LExit: + return hr; +} diff --git a/src/ext/Bal/test/examples/TestEngine/ShutdownEngine.h b/src/ext/Bal/test/examples/TestEngine/ShutdownEngine.h new file mode 100644 index 00000000..0cfa147a --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/ShutdownEngine.h @@ -0,0 +1,8 @@ +#pragma once +// 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. + + +HRESULT RunShutdownEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ); diff --git a/src/ext/Bal/test/examples/TestEngine/TestEngine.cpp b/src/ext/Bal/test/examples/TestEngine/TestEngine.cpp new file mode 100644 index 00000000..4c7ec1c3 --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/TestEngine.cpp @@ -0,0 +1,256 @@ +// 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. + +#include "precomp.h" + +HRESULT TestEngine::Initialize( + __in LPCWSTR wzBundleFilePath + ) +{ + HRESULT hr = S_OK; + MSG msg = { }; + + LogInitialize(::GetModuleHandleW(NULL)); + + hr = LogOpen(NULL, PathFile(wzBundleFilePath), NULL, L"txt", FALSE, FALSE, NULL); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to open log."); + + ::PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); + +LExit: + return hr; +} + +HRESULT TestEngine::LoadBA( + __in LPCWSTR wzBAFilePath + ) +{ + HRESULT hr = S_OK; + BOOTSTRAPPER_COMMAND command = { }; + BOOTSTRAPPER_CREATE_ARGS args = { }; + PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL; + + if (m_pCreateResults || m_hBAModule) + { + ExitFunction1(hr = E_INVALIDSTATE); + } + + m_pCreateResults = static_cast(MemAlloc(sizeof(BOOTSTRAPPER_CREATE_RESULTS), TRUE)); + + command.cbSize = sizeof(BOOTSTRAPPER_COMMAND); + + hr = PathGetDirectory(wzBAFilePath, &command.wzBootstrapperWorkingFolder); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to allocate wzBootstrapperWorkingFolder"); + + hr = PathConcat(command.wzBootstrapperWorkingFolder, L"BootstrapperApplicationData.xml", &command.wzBootstrapperApplicationDataPath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to allocate wzBootstrapperApplicationDataPath"); + + args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS); + args.pCommand = &command; + args.pfnBootstrapperEngineProc = TestEngine::EngineProc; + args.pvBootstrapperEngineProcContext = this; + args.qwEngineAPIVersion = MAKEQWORDVERSION(0, 0, 0, 1); + + m_pCreateResults->cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); + + m_hBAModule = ::LoadLibraryExW(wzBAFilePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + 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."); + + hr = pfnCreate(&args, m_pCreateResults); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure on BootstrapperApplicationCreate."); + +LExit: + ReleaseStr(command.wzBootstrapperApplicationDataPath); + ReleaseStr(command.wzBootstrapperWorkingFolder); + + return hr; +} + +HRESULT TestEngine::Log( + __in BOOTSTRAPPER_LOG_LEVEL level, + __in LPCWSTR 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() +{ + HRESULT hr = S_OK; + MSG msg = { }; + BOOL fRet = FALSE; + + // Enter the message pump. + while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0))) + { + if (-1 == fRet) + { + ConsoleExitOnFailure(hr = E_UNEXPECTED, CONSOLE_COLOR_RED, "Unexpected return value from message pump."); + } + else + { + ProcessBAMessage(&msg); + } + } + +LExit: + return hr; +} + +HRESULT TestEngine::SendShutdownEvent( + __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction + ) +{ + HRESULT hr = S_OK; + BA_ONSHUTDOWN_ARGS shutdownArgs = { }; + BA_ONSHUTDOWN_RESULTS shutdownResults = { }; + shutdownArgs.cbSize = sizeof(BA_ONSHUTDOWN_ARGS); + shutdownResults.action = defaultAction; + shutdownResults.cbSize = sizeof(BA_ONSHUTDOWN_RESULTS); + hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN, &shutdownArgs, &shutdownResults, m_pCreateResults->pvBootstrapperApplicationProcContext); + return hr; +} + +HRESULT TestEngine::SendStartupEvent() +{ + HRESULT hr = S_OK; + BA_ONSTARTUP_ARGS startupArgs = { }; + BA_ONSTARTUP_RESULTS startupResults = { }; + startupArgs.cbSize = sizeof(BA_ONSTARTUP_ARGS); + startupResults.cbSize = sizeof(BA_ONSTARTUP_RESULTS); + hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP, &startupArgs, &startupResults, m_pCreateResults->pvBootstrapperApplicationProcContext); + return hr; +} + +HRESULT TestEngine::SimulateQuit( + __in DWORD dwExitCode + ) +{ + BAENGINE_QUIT_ARGS args = { }; + BAENGINE_QUIT_RESULTS results = { }; + + args.cbSize = sizeof(BAENGINE_QUIT_ARGS); + args.dwExitCode = dwExitCode; + + results.cbSize = sizeof(BAENGINE_QUIT_RESULTS); + + return BAEngineQuit(&args, &results); +} + +void TestEngine::UnloadBA() +{ + PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = NULL; + BOOL fDisableUnloading = m_pCreateResults && m_pCreateResults->fDisableUnloading; + + ReleaseNullMem(m_pCreateResults); + + pfnDestroy = (PFN_BOOTSTRAPPER_APPLICATION_DESTROY)::GetProcAddress(m_hBAModule, "BootstrapperApplicationDestroy"); + + if (pfnDestroy) + { + pfnDestroy(); + } + + if (m_hBAModule) + { + if (!fDisableUnloading) + { + ::FreeLibrary(m_hBAModule); + } + + m_hBAModule = NULL; + } +} + +HRESULT TestEngine::BAEngineLog( + __in BAENGINE_LOG_ARGS* pArgs, + __in BAENGINE_LOG_RESULTS* /*pResults*/ + ) +{ + return Log(pArgs->level, pArgs->wzMessage); +} + +HRESULT TestEngine::BAEngineQuit( + __in BAENGINE_QUIT_ARGS* pArgs, + __in BAENGINE_QUIT_RESULTS* /*pResults*/ + ) +{ + HRESULT hr = S_OK; + + if (!::PostThreadMessageW(m_dwThreadId, WM_TESTENG_QUIT, static_cast(pArgs->dwExitCode), 0)) + { + ConsoleExitWithLastError(hr, CONSOLE_COLOR_RED, "Failed to post shutdown message."); + } + +LExit: + return hr; +} + +HRESULT WINAPI TestEngine::EngineProc( + __in BOOTSTRAPPER_ENGINE_MESSAGE message, + __in const LPVOID pvArgs, + __inout LPVOID pvResults, + __in_opt LPVOID pvContext + ) +{ + HRESULT hr = S_OK; + TestEngine* pContext = (TestEngine*)pvContext; + + if (!pContext || !pvArgs || !pvResults) + { + ExitFunction1(hr = E_INVALIDARG); + } + + switch (message) + { + case BOOTSTRAPPER_ENGINE_MESSAGE_LOG: + hr = pContext->BAEngineLog(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_ENGINE_MESSAGE_QUIT: + hr = pContext->BAEngineQuit(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + default: + hr = E_NOTIMPL; + break; + } + +LExit: + return hr; +} + +HRESULT TestEngine::ProcessBAMessage( + __in const MSG* pmsg + ) +{ + HRESULT hr = S_OK; + + switch (pmsg->message) + { + case WM_TESTENG_QUIT: + ::PostQuitMessage(static_cast(pmsg->wParam)); // go bye-bye. + break; + } + + return hr; +} + +TestEngine::TestEngine() +{ + m_hBAModule = NULL; + m_pCreateResults = NULL; + m_dwThreadId = ::GetCurrentThreadId(); +} + +TestEngine::~TestEngine() +{ + ReleaseMem(m_pCreateResults); +} diff --git a/src/ext/Bal/test/examples/TestEngine/TestEngine.h b/src/ext/Bal/test/examples/TestEngine/TestEngine.h new file mode 100644 index 00000000..44e813bd --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/TestEngine.h @@ -0,0 +1,80 @@ +#pragma once +// 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. + + +enum WM_TESTENG +{ + WM_TESTENG_FIRST = WM_APP + 0xFFF, // this enum value must always be first. + + WM_TESTENG_DETECT, + WM_TESTENG_PLAN, + WM_TESTENG_ELEVATE, + WM_TESTENG_APPLY, + WM_TESTENG_LAUNCH_APPROVED_EXE, + WM_TESTENG_QUIT, + + WM_TESTENG_LAST, // this enum value must always be last. +}; + +class TestEngine +{ +public: + HRESULT Initialize( + __in LPCWSTR wzBundleFilePath + ); + + HRESULT LoadBA( + __in LPCWSTR wzBAFilePath + ); + + HRESULT Log( + __in BOOTSTRAPPER_LOG_LEVEL level, + __in LPCWSTR wzMessage + ); + + HRESULT RunApplication(); + + HRESULT SendShutdownEvent( + __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction + ); + + HRESULT SendStartupEvent(); + + HRESULT SimulateQuit( + __in DWORD dwExitCode + ); + + void UnloadBA(); + +private: + HRESULT BAEngineLog( + __in BAENGINE_LOG_ARGS* pArgs, + __in BAENGINE_LOG_RESULTS* pResults + ); + + HRESULT BAEngineQuit( + __in BAENGINE_QUIT_ARGS* pArgs, + __in BAENGINE_QUIT_RESULTS* pResults + ); + + static HRESULT WINAPI EngineProc( + __in BOOTSTRAPPER_ENGINE_MESSAGE message, + __in const LPVOID pvArgs, + __inout LPVOID pvResults, + __in_opt LPVOID pvContext + ); + + HRESULT ProcessBAMessage( + __in const MSG* pmsg + ); + +public: + TestEngine(); + + ~TestEngine(); + +private: + HMODULE m_hBAModule; + BOOTSTRAPPER_CREATE_RESULTS* m_pCreateResults; + DWORD m_dwThreadId; +}; \ No newline at end of file diff --git a/src/ext/Bal/test/examples/TestEngine/WaitForQuitEngine.cpp b/src/ext/Bal/test/examples/TestEngine/WaitForQuitEngine.cpp new file mode 100644 index 00000000..2f80ba75 --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/WaitForQuitEngine.cpp @@ -0,0 +1,35 @@ +// 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. + +#include "precomp.h" + +HRESULT RunWaitForQuitEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ) +{ + HRESULT hr = S_OK; + TestEngine* pTestEngine = NULL; + + pTestEngine = new TestEngine(); + ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); + + hr = pTestEngine->Initialize(wzBundleFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine."); + + hr = pTestEngine->LoadBA(wzBAFilePath); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); + + hr = pTestEngine->SendStartupEvent(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); + + hr = pTestEngine->RunApplication(); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); + + hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); + ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); + + pTestEngine->UnloadBA(); + +LExit: + return hr; +} diff --git a/src/ext/Bal/test/examples/TestEngine/WaitForQuitEngine.h b/src/ext/Bal/test/examples/TestEngine/WaitForQuitEngine.h new file mode 100644 index 00000000..99e3f63c --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/WaitForQuitEngine.h @@ -0,0 +1,8 @@ +#pragma once +// 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. + + +HRESULT RunWaitForQuitEngine( + __in LPCWSTR wzBundleFilePath, + __in LPCWSTR wzBAFilePath + ); diff --git a/src/ext/Bal/test/examples/TestEngine/packages.config b/src/ext/Bal/test/examples/TestEngine/packages.config new file mode 100644 index 00000000..548ddb48 --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/packages.config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/test/examples/TestEngine/precomp.cpp b/src/ext/Bal/test/examples/TestEngine/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/precomp.cpp @@ -0,0 +1,3 @@ +// 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. + +#include "precomp.h" diff --git a/src/ext/Bal/test/examples/TestEngine/precomp.h b/src/ext/Bal/test/examples/TestEngine/precomp.h new file mode 100644 index 00000000..f943f420 --- /dev/null +++ b/src/ext/Bal/test/examples/TestEngine/precomp.h @@ -0,0 +1,20 @@ +#pragma once +// 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. + +#include +#include + +#include "dutil.h" +#include "conutil.h" +#include "logutil.h" +#include "memutil.h" +#include "pathutil.h" +#include "strutil.h" + +#include "BootstrapperEngine.h" +#include "BootstrapperApplication.h" + +#include "TestEngine.h" +#include "ReloadEngine.h" +#include "ShutdownEngine.h" +#include "WaitForQuitEngine.h" diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs new file mode 100644 index 00000000..68d742b0 --- /dev/null +++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj b/src/ext/Bal/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj new file mode 100644 index 00000000..ba75a9ff --- /dev/null +++ b/src/ext/Bal/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj @@ -0,0 +1,2 @@ + + diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/AssemblyInfo.cs b/src/ext/Bal/test/examples/WPFCoreMBA/AssemblyInfo.cs new file mode 100644 index 00000000..03a5c7fa --- /dev/null +++ b/src/ext/Bal/test/examples/WPFCoreMBA/AssemblyInfo.cs @@ -0,0 +1,12 @@ +// 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. + +using System.Windows; + +[assembly:ThemeInfo( + ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located + //(used if a resource is not found in the page, + // or application resource dictionaries) + ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located + //(used if a resource is not found in the page, + // app, or any theme specific resource dictionaries) +)] diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj new file mode 100644 index 00000000..296e5be9 --- /dev/null +++ b/src/ext/Bal/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj @@ -0,0 +1,16 @@ + + + + net5.0-windows + win-x86;win-x64 + true + WPF .NET Core MBA + true + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/MainWindow.xaml b/src/ext/Bal/test/examples/WPFCoreMBA/MainWindow.xaml new file mode 100644 index 00000000..40a27a06 --- /dev/null +++ b/src/ext/Bal/test/examples/WPFCoreMBA/MainWindow.xaml @@ -0,0 +1,16 @@ + + + + + + + + + diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/MainWindow.xaml.cs b/src/ext/Bal/test/examples/WPFCoreMBA/MainWindow.xaml.cs new file mode 100644 index 00000000..4f61b807 --- /dev/null +++ b/src/ext/Bal/test/examples/WPFCoreMBA/MainWindow.xaml.cs @@ -0,0 +1,17 @@ +// 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. + +namespace Example.WPFCoreMBA +{ + using System.Windows; + + /// + /// Interaction logic for MainWindow.xaml + /// + public partial class MainWindow : Window + { + public MainWindow() + { + this.InitializeComponent(); + } + } +} diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs new file mode 100644 index 00000000..d50be813 --- /dev/null +++ b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBA.cs @@ -0,0 +1,42 @@ +// 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. + +namespace Example.WPFCoreMBA +{ + using System.Windows.Threading; + using WixToolset.Mba.Core; + + public class WPFCoreBA : BootstrapperApplication + { + public WPFCoreBA(IEngine engine) + : base(engine) + { + } + + public Dispatcher BADispatcher { get; private set; } + + protected override void Run() + { + this.BADispatcher = Dispatcher.CurrentDispatcher; + var window = new MainWindow(); + window.Closed += (s, e) => this.BADispatcher.InvokeShutdown(); + //window.Show(); + //Dispatcher.Run(); + //this.engine.Quit(0); + } + + protected override void OnStartup(StartupEventArgs args) + { + base.OnStartup(args); + + this.engine.Log(LogLevel.Standard, nameof(WPFCoreBA)); + } + + protected override void OnShutdown(ShutdownEventArgs args) + { + base.OnShutdown(args); + + var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); + this.engine.Log(LogLevel.Standard, message); + } + } +} diff --git a/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs new file mode 100644 index 00000000..a3ccdf9f --- /dev/null +++ b/src/ext/Bal/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs @@ -0,0 +1,22 @@ +// 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. + +[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.WPFCoreMBA.WPFCoreBAFactory))] +namespace Example.WPFCoreMBA +{ + using WixToolset.Mba.Core; + + public class WPFCoreBAFactory : BaseBootstrapperApplicationFactory + { + private static int loadCount = 0; + + protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) + { + if (loadCount > 0) + { + engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); + } + ++loadCount; + return new WPFCoreBA(engine); + } + } +} diff --git a/src/ext/Bal/test/examples/Wix.Build.props b/src/ext/Bal/test/examples/Wix.Build.props new file mode 100644 index 00000000..aad94bb6 --- /dev/null +++ b/src/ext/Bal/test/examples/Wix.Build.props @@ -0,0 +1,10 @@ + + + + + Bundle + .exe + -generate payloadgroup + $(OutputPath)examples\ + + diff --git a/src/ext/Bal/test/examples/Wix.Build.targets b/src/ext/Bal/test/examples/Wix.Build.targets new file mode 100644 index 00000000..7e6fe9f2 --- /dev/null +++ b/src/ext/Bal/test/examples/Wix.Build.targets @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/src/ext/Bal/test/examples/examples.proj b/src/ext/Bal/test/examples/examples.proj new file mode 100644 index 00000000..08cb7511 --- /dev/null +++ b/src/ext/Bal/test/examples/examples.proj @@ -0,0 +1,50 @@ + + + + + + + + + EarliestCoreMBA\Example.EarliestCoreMBA.csproj + FullFramework2MBA\Example.FullFramework2MBA.csproj + FullFramework4MBA\Example.FullFramework4MBA.csproj + LatestCoreMBA\Example.LatestCoreMBA.csproj + WPFCoreMBA\Example.WPFCoreMBA.csproj + $(OutputPath)examples\publish\ + + + + + $(MBAPublishPath)Example.EarliestCoreMBA + + + $(MBAPublishPath)Example.LatestCoreMBA + + + $(MBAPublishPath)Example.WPFCoreMBA + true + true + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/wix.snk b/src/ext/Bal/wix.snk new file mode 100644 index 00000000..3908a66a Binary files /dev/null and b/src/ext/Bal/wix.snk differ diff --git a/src/ext/Bal/wixext/BalBurnBackendExtension.cs b/src/ext/Bal/wixext/BalBurnBackendExtension.cs new file mode 100644 index 00000000..e8dc7a3e --- /dev/null +++ b/src/ext/Bal/wixext/BalBurnBackendExtension.cs @@ -0,0 +1,171 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Collections.Generic; + using System.Linq; + using WixToolset.Bal.Symbols; + using WixToolset.Data; + using WixToolset.Data.Burn; + using WixToolset.Data.Symbols; + using WixToolset.Extensibility; + + public class BalBurnBackendExtension : BaseBurnBackendBinderExtension + { + private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions = + { + BalSymbolDefinitions.WixBalBAFactoryAssembly, + BalSymbolDefinitions.WixBalBAFunctions, + BalSymbolDefinitions.WixBalCondition, + BalSymbolDefinitions.WixBalPackageInfo, + BalSymbolDefinitions.WixDncOptions, + BalSymbolDefinitions.WixMbaPrereqInformation, + BalSymbolDefinitions.WixStdbaOptions, + BalSymbolDefinitions.WixStdbaOverridableVariable, + }; + + protected override IReadOnlyCollection SymbolDefinitions => BurnSymbolDefinitions; + + public override void SymbolsFinalized(IntermediateSection section) + { + base.SymbolsFinalized(section); + + var baSymbol = section.Symbols.OfType().SingleOrDefault(); + var baId = baSymbol?.Id?.Id; + if (null == baId) + { + return; + } + + var isStdBA = baId.StartsWith("WixStandardBootstrapperApplication"); + var isMBA = baId.StartsWith("WixManagedBootstrapperApplicationHost"); + var isDNC = baId.StartsWith("WixDotNetCoreBootstrapperApplicationHost"); + var isSCD = isDNC && this.VerifySCD(section); + + if (isDNC) + { + this.FinalizeBAFactorySymbol(section); + } + + if (isStdBA || isMBA || isDNC) + { + this.VerifyBAFunctions(section); + } + + if (isMBA || (isDNC && !isSCD)) + { + this.VerifyPrereqPackages(section, isDNC); + } + } + + private void FinalizeBAFactorySymbol(IntermediateSection section) + { + var factorySymbol = section.Symbols.OfType().SingleOrDefault(); + if (null == factorySymbol) + { + return; + } + + var factoryPayloadSymbol = section.Symbols.OfType() + .Where(p => p.Id.Id == factorySymbol.PayloadId) + .SingleOrDefault(); + if (null == factoryPayloadSymbol) + { + return; + } + + factorySymbol.FilePath = factoryPayloadSymbol.Name; + } + + private void VerifyBAFunctions(IntermediateSection section) + { + WixBalBAFunctionsSymbol baFunctionsSymbol = null; + foreach (var symbol in section.Symbols.OfType()) + { + if (null == baFunctionsSymbol) + { + baFunctionsSymbol = symbol; + } + else + { + this.Messaging.Write(BalErrors.MultipleBAFunctions(symbol.SourceLineNumbers)); + } + } + + var payloadPropertiesSymbols = section.Symbols.OfType().ToList(); + if (null == baFunctionsSymbol) + { + foreach (var payloadPropertiesSymbol in payloadPropertiesSymbols) + { + if (string.Equals(payloadPropertiesSymbol.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase) && + BurnConstants.BurnUXContainerName == payloadPropertiesSymbol.ContainerRef) + { + this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesSymbol.SourceLineNumbers)); + } + } + } + else + { + var payloadId = baFunctionsSymbol.Id; + var bundlePayloadSymbol = payloadPropertiesSymbols.Single(x => payloadId == x.Id); + if (BurnConstants.BurnUXContainerName != bundlePayloadSymbol.ContainerRef) + { + this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsSymbol.SourceLineNumbers)); + } + } + } + + private void VerifyPrereqPackages(IntermediateSection section, bool isDNC) + { + var prereqInfoSymbols = section.Symbols.OfType().ToList(); + if (prereqInfoSymbols.Count == 0) + { + var message = isDNC ? BalErrors.MissingDNCPrereq() : BalErrors.MissingMBAPrereq(); + this.Messaging.Write(message); + return; + } + + var foundLicenseFile = false; + var foundLicenseUrl = false; + + foreach (var prereqInfoSymbol in prereqInfoSymbols) + { + if (null != prereqInfoSymbol.LicenseFile) + { + if (foundLicenseFile || foundLicenseUrl) + { + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); + return; + } + + foundLicenseFile = true; + } + + if (null != prereqInfoSymbol.LicenseUrl) + { + if (foundLicenseFile || foundLicenseUrl) + { + this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); + return; + } + + foundLicenseUrl = true; + } + } + } + + private bool VerifySCD(IntermediateSection section) + { + var isSCD = false; + + var dncOptions = section.Symbols.OfType().SingleOrDefault(); + if (dncOptions != null) + { + isSCD = dncOptions.SelfContainedDeployment != 0; + } + + return isSCD; + } + } +} diff --git a/src/ext/Bal/wixext/BalCompiler.cs b/src/ext/Bal/wixext/BalCompiler.cs new file mode 100644 index 00000000..267345e7 --- /dev/null +++ b/src/ext/Bal/wixext/BalCompiler.cs @@ -0,0 +1,923 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Collections.Generic; + using System.Xml.Linq; + using WixToolset.Bal.Symbols; + using WixToolset.Data; + using WixToolset.Data.Symbols; + using WixToolset.Extensibility; + using WixToolset.Extensibility.Data; + + /// + /// The compiler for the WiX Toolset Bal Extension. + /// + public sealed class BalCompiler : BaseCompilerExtension + { + private readonly Dictionary prereqInfoSymbolsByPackageId; + + private enum WixDotNetCoreBootstrapperApplicationHostTheme + { + Unknown, + None, + Standard, + } + + private enum WixManagedBootstrapperApplicationHostTheme + { + Unknown, + None, + Standard, + } + + private enum WixStandardBootstrapperApplicationTheme + { + Unknown, + HyperlinkLargeLicense, + HyperlinkLicense, + HyperlinkSidebarLicense, + None, + RtfLargeLicense, + RtfLicense, + } + + /// + /// Instantiate a new BalCompiler. + /// + public BalCompiler() + { + this.prereqInfoSymbolsByPackageId = new Dictionary(); + } + + public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/bal"; + + /// + /// Processes an element for the Compiler. + /// + /// + /// + /// Parent element of element to process. + /// Element to process. + /// Extra information about the context in which this element is being parsed. + public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) + { + switch (parentElement.Name.LocalName) + { + case "Bundle": + case "Fragment": + switch (element.Name.LocalName) + { + case "Condition": + this.ParseConditionElement(intermediate, section, element); + break; + case "ManagedBootstrapperApplicationPrereqInformation": + this.ParseMbaPrereqInfoElement(intermediate, section, element); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + case "BootstrapperApplication": + switch (element.Name.LocalName) + { + case "WixStandardBootstrapperApplication": + this.ParseWixStandardBootstrapperApplicationElement(intermediate, section, element); + break; + case "WixManagedBootstrapperApplicationHost": + this.ParseWixManagedBootstrapperApplicationHostElement(intermediate, section, element); + break; + case "WixDotNetCoreBootstrapperApplicationHost": + this.ParseWixDotNetCoreBootstrapperApplicationHostElement(intermediate, section, element); + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + break; + default: + this.ParseHelper.UnexpectedElement(parentElement, element); + break; + } + } + + /// + /// Processes an attribute for the Compiler. + /// + /// Source line number for the parent element. + /// Parent element of element to process. + /// Attribute to process. + /// Extra information about the context in which this element is being parsed. + public override void ParseAttribute(Intermediate intermediate, IntermediateSection section, XElement parentElement, XAttribute attribute, IDictionary context) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(parentElement); + WixMbaPrereqInformationSymbol prereqInfo; + + switch (parentElement.Name.LocalName) + { + case "ExePackage": + case "MsiPackage": + case "MspPackage": + case "MsuPackage": + string packageId; + if (!context.TryGetValue("PackageId", out packageId) || String.IsNullOrEmpty(packageId)) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); + } + else + { + switch (attribute.Name.LocalName) + { + case "DisplayInternalUICondition": + switch (parentElement.Name.LocalName) + { + case "MsiPackage": + case "MspPackage": + var displayInternalUICondition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); + section.AddSymbol(new WixBalPackageInfoSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, packageId)) + { + PackageId = packageId, + DisplayInternalUICondition = displayInternalUICondition, + }); + break; + default: + this.ParseHelper.UnexpectedAttribute(parentElement, attribute); + break; + } + break; + case "PrereqLicenseFile": + + if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) + { + // at the time the extension attribute is parsed, the compiler might not yet have + // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. + var prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); + + if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) + { + prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) + { + PackageId = packageId, + }); + + this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); + } + else + { + this.Messaging.Write(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile")); + break; + } + } + + if (null != prereqInfo.LicenseUrl) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile", "PrereqLicenseUrl")); + } + else + { + prereqInfo.LicenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); + } + break; + case "PrereqLicenseUrl": + + if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) + { + // at the time the extension attribute is parsed, the compiler might not yet have + // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. + var prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); + + if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) + { + prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) + { + PackageId = packageId, + }); + + this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); + } + else + { + this.Messaging.Write(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl")); + break; + } + } + + if (null != prereqInfo.LicenseFile) + { + this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl", "PrereqLicenseFile")); + } + else + { + prereqInfo.LicenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); + } + break; + case "PrereqPackage": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + { + if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) + { + prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) + { + PackageId = packageId, + }); + + this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); + } + } + break; + default: + this.ParseHelper.UnexpectedAttribute(parentElement, attribute); + break; + } + } + break; + case "Payload": + string payloadId; + if (!context.TryGetValue("Id", out payloadId) || String.IsNullOrEmpty(payloadId)) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); + } + else + { + switch (attribute.Name.LocalName) + { + case "BAFactoryAssembly": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + { + // There can only be one. + var id = new Identifier(AccessModifier.Global, "TheBAFactoryAssembly"); + section.AddSymbol(new WixBalBAFactoryAssemblySymbol(sourceLineNumbers, id) + { + PayloadId = payloadId, + }); + } + break; + case "BAFunctions": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + { + section.AddSymbol(new WixBalBAFunctionsSymbol(sourceLineNumbers) + { + PayloadId = payloadId, + }); + } + break; + default: + this.ParseHelper.UnexpectedAttribute(parentElement, attribute); + break; + } + } + break; + case "Variable": + // at the time the extension attribute is parsed, the compiler might not yet have + // parsed the Name attribute, so we need to get it directly from the parent element. + var variableName = parentElement.Attribute("Name"); + if (null == variableName) + { + this.Messaging.Write(ErrorMessages.ExpectedParentWithAttribute(sourceLineNumbers, "Variable", "Overridable", "Name")); + } + else + { + switch (attribute.Name.LocalName) + { + case "Overridable": + if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) + { + section.AddSymbol(new WixStdbaOverridableVariableSymbol(sourceLineNumbers) + { + Name = variableName.Value, + }); + } + break; + default: + this.ParseHelper.UnexpectedAttribute(parentElement, attribute); + break; + } + } + break; + } + } + + /// + /// Parses a Condition element for Bundles. + /// + /// The element to parse. + private void ParseConditionElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + string condition = null; + string message = null; + + foreach (var attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "Message": + message = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Condition": + condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + + // Error check the values. + if (String.IsNullOrEmpty(condition)) + { + this.Messaging.Write(ErrorMessages.ConditionExpected(sourceLineNumbers, node.Name.LocalName)); + } + + if (null == message) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Message")); + } + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new WixBalConditionSymbol(sourceLineNumbers) + { + Condition = condition, + Message = message, + }); + } + } + + /// + /// Parses a Condition element for Bundles. + /// + /// The element to parse. + private void ParseMbaPrereqInfoElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + string packageId = null; + string licenseFile = null; + string licenseUrl = null; + + foreach (var attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "LicenseFile": + licenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LicenseUrl": + licenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "PackageId": + packageId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + + if (null == packageId) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PackageId")); + } + + if (null == licenseFile && null == licenseUrl || + null != licenseFile && null != licenseUrl) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true)); + } + + if (!this.Messaging.EncounteredError) + { + section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) + { + PackageId = packageId, + LicenseFile = licenseFile, + LicenseUrl = licenseUrl, + }); + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePackage, packageId); + } + } + + /// + /// Parses a WixStandardBootstrapperApplication element for Bundles. + /// + /// The element to parse. + private void ParseWixStandardBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + string launchTarget = null; + string launchTargetElevatedId = null; + string launchArguments = null; + var launchHidden = YesNoType.NotSet; + string launchWorkingDir = null; + string licenseFile = null; + string licenseUrl = null; + string logoFile = null; + string logoSideFile = null; + WixStandardBootstrapperApplicationTheme? theme = null; + string themeFile = null; + string localizationFile = null; + var suppressOptionsUI = YesNoType.NotSet; + var suppressDowngradeFailure = YesNoType.NotSet; + var suppressRepair = YesNoType.NotSet; + var showVersion = YesNoType.NotSet; + var supportCacheOnly = YesNoType.NotSet; + + foreach (var attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "LaunchTarget": + launchTarget = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LaunchTargetElevatedId": + launchTargetElevatedId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); + break; + case "LaunchArguments": + launchArguments = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LaunchHidden": + launchHidden = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "LaunchWorkingFolder": + launchWorkingDir = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LicenseFile": + licenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LicenseUrl": + licenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); + break; + case "LogoFile": + logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LogoSideFile": + logoSideFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ThemeFile": + themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LocalizationFile": + localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "SuppressOptionsUI": + suppressOptionsUI = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "SuppressDowngradeFailure": + suppressDowngradeFailure = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "SuppressRepair": + suppressRepair = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "ShowVersion": + showVersion = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "SupportCacheOnly": + supportCacheOnly = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Theme": + var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (themeValue) + { + case "hyperlinkLargeLicense": + theme = WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense; + break; + case "hyperlinkLicense": + theme = WixStandardBootstrapperApplicationTheme.HyperlinkLicense; + break; + case "hyperlinkSidebarLicense": + theme = WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense; + break; + case "none": + theme = WixStandardBootstrapperApplicationTheme.None; + break; + case "rtfLargeLicense": + theme = WixStandardBootstrapperApplicationTheme.RtfLargeLicense; + break; + case "rtfLicense": + theme = WixStandardBootstrapperApplicationTheme.RtfLicense; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "hyperlinkLargeLicense", "hyperlinkLicense", "hyperlinkSidebarLicense", "none", "rtfLargeLicense", "rtfLicense")); + theme = WixStandardBootstrapperApplicationTheme.Unknown; // set a value to prevent expected attribute error below. + break; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + + if (!theme.HasValue) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Theme")); + } + + if (theme != WixStandardBootstrapperApplicationTheme.None && String.IsNullOrEmpty(licenseFile) && null == licenseUrl) + { + this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true)); + } + + if (!this.Messaging.EncounteredError) + { + if (!String.IsNullOrEmpty(launchTarget)) + { + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTarget")) + { + Value = launchTarget, + Type = WixBundleVariableType.Formatted, + }); + } + + if (!String.IsNullOrEmpty(launchTargetElevatedId)) + { + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTargetElevatedId")) + { + Value = launchTargetElevatedId, + Type = WixBundleVariableType.Formatted, + }); + } + + if (!String.IsNullOrEmpty(launchArguments)) + { + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchArguments")) + { + Value = launchArguments, + Type = WixBundleVariableType.Formatted, + }); + } + + if (YesNoType.Yes == launchHidden) + { + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchHidden")) + { + Value = "yes", + Type = WixBundleVariableType.Formatted, + }); + } + + + if (!String.IsNullOrEmpty(launchWorkingDir)) + { + section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchWorkingFolder")) + { + Value = launchWorkingDir, + Type = WixBundleVariableType.Formatted, + }); + } + + if (!String.IsNullOrEmpty(licenseFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseRtf")) + { + Value = licenseFile, + }); + } + + if (null != licenseUrl) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseUrl")) + { + Value = licenseUrl, + }); + } + + if (!String.IsNullOrEmpty(logoFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogo")) + { + Value = logoFile, + }); + } + + if (!String.IsNullOrEmpty(logoSideFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogoSide")) + { + Value = logoSideFile, + }); + } + + if (!String.IsNullOrEmpty(themeFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeXml")) + { + Value = themeFile, + }); + } + + if (!String.IsNullOrEmpty(localizationFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeWxl")) + { + Value = localizationFile, + }); + } + + if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly) + { + var symbol = section.AddSymbol(new WixStdbaOptionsSymbol(sourceLineNumbers)); + if (YesNoType.Yes == suppressOptionsUI) + { + symbol.SuppressOptionsUI = 1; + } + + if (YesNoType.Yes == suppressDowngradeFailure) + { + symbol.SuppressDowngradeFailure = 1; + } + + if (YesNoType.Yes == suppressRepair) + { + symbol.SuppressRepair = 1; + } + + if (YesNoType.Yes == showVersion) + { + symbol.ShowVersion = 1; + } + + if (YesNoType.Yes == supportCacheOnly) + { + symbol.SupportCacheOnly = 1; + } + } + + var baId = "WixStandardBootstrapperApplication"; + switch (theme) + { + case WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense: + baId = "WixStandardBootstrapperApplication.HyperlinkLargeLicense"; + break; + case WixStandardBootstrapperApplicationTheme.HyperlinkLicense: + baId = "WixStandardBootstrapperApplication.HyperlinkLicense"; + break; + case WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense: + baId = "WixStandardBootstrapperApplication.HyperlinkSidebarLicense"; + break; + case WixStandardBootstrapperApplicationTheme.RtfLargeLicense: + baId = "WixStandardBootstrapperApplication.RtfLargeLicense"; + break; + case WixStandardBootstrapperApplicationTheme.RtfLicense: + baId = "WixStandardBootstrapperApplication.RtfLicense"; + break; + } + + this.CreateBARef(section, sourceLineNumbers, node, baId); + } + } + + /// + /// Parses a WixManagedBootstrapperApplicationHost element for Bundles. + /// + /// The element to parse. + private void ParseWixManagedBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + string logoFile = null; + string themeFile = null; + string localizationFile = null; + WixManagedBootstrapperApplicationHostTheme? theme = null; + + foreach (var attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "LogoFile": + logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ThemeFile": + themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LocalizationFile": + localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "Theme": + var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (themeValue) + { + case "none": + theme = WixManagedBootstrapperApplicationHostTheme.None; + break; + case "standard": + theme = WixManagedBootstrapperApplicationHostTheme.Standard; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "none", "standard")); + theme = WixManagedBootstrapperApplicationHostTheme.Unknown; + break; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + if (!theme.HasValue) + { + theme = WixManagedBootstrapperApplicationHostTheme.Standard; + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + + if (!this.Messaging.EncounteredError) + { + if (!String.IsNullOrEmpty(logoFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaLogo")) + { + Value = logoFile, + }); + } + + if (!String.IsNullOrEmpty(themeFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeXml")) + { + Value = themeFile, + }); + } + + if (!String.IsNullOrEmpty(localizationFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeWxl")) + { + Value = localizationFile, + }); + } + + var baId = "WixManagedBootstrapperApplicationHost"; + switch (theme) + { + case WixManagedBootstrapperApplicationHostTheme.Standard: + baId = "WixManagedBootstrapperApplicationHost.Standard"; + break; + } + + this.CreateBARef(section, sourceLineNumbers, node, baId); + } + } + + /// + /// Parses a WixDotNetCoreBootstrapperApplication element for Bundles. + /// + /// The element to parse. + private void ParseWixDotNetCoreBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node) + { + var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); + string logoFile = null; + string themeFile = null; + string localizationFile = null; + var selfContainedDeployment = YesNoType.NotSet; + WixDotNetCoreBootstrapperApplicationHostTheme? theme = null; + + foreach (var attrib in node.Attributes()) + { + if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) + { + switch (attrib.Name.LocalName) + { + case "LogoFile": + logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "ThemeFile": + themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "LocalizationFile": + localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + break; + case "SelfContainedDeployment": + selfContainedDeployment = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); + break; + case "Theme": + var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); + switch (themeValue) + { + case "none": + theme = WixDotNetCoreBootstrapperApplicationHostTheme.None; + break; + case "standard": + theme = WixDotNetCoreBootstrapperApplicationHostTheme.Standard; + break; + default: + this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "none", "standard")); + theme = WixDotNetCoreBootstrapperApplicationHostTheme.Unknown; + break; + } + break; + default: + this.ParseHelper.UnexpectedAttribute(node, attrib); + break; + } + } + else + { + this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); + } + } + + if (!theme.HasValue) + { + theme = WixDotNetCoreBootstrapperApplicationHostTheme.Standard; + } + + this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); + + if (!this.Messaging.EncounteredError) + { + if (!String.IsNullOrEmpty(logoFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaLogo")) + { + Value = logoFile, + }); + } + + if (!String.IsNullOrEmpty(themeFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeXml")) + { + Value = themeFile, + }); + } + + if (!String.IsNullOrEmpty(localizationFile)) + { + section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeWxl")) + { + Value = localizationFile, + }); + } + + if (YesNoType.Yes == selfContainedDeployment) + { + section.AddSymbol(new WixDncOptionsSymbol(sourceLineNumbers) + { + SelfContainedDeployment = 1, + }); + } + + var baId = "WixDotNetCoreBootstrapperApplicationHost"; + switch (theme) + { + case WixDotNetCoreBootstrapperApplicationHostTheme.Standard: + baId = "WixDotNetCoreBootstrapperApplicationHost.Standard"; + break; + } + + this.CreateBARef(section, sourceLineNumbers, node, baId); + } + } + + private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name) + { + var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); + if (id == null) + { + this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName)); + } + + if (!this.Messaging.EncounteredError) + { + this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBootstrapperApplication, id); + } + } + } +} diff --git a/src/ext/Bal/wixext/BalErrors.cs b/src/ext/Bal/wixext/BalErrors.cs new file mode 100644 index 00000000..bc0186c1 --- /dev/null +++ b/src/ext/Bal/wixext/BalErrors.cs @@ -0,0 +1,61 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Resources; + using WixToolset.Data; + + public static class BalErrors + { + public static Message AttributeRequiresPrereqPackage(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) + { + return Message(sourceLineNumbers, Ids.AttributeRequiresPrereqPackage, "When the {0}/@{1} attribute is specified, the {0}/@PrereqPackage attribute must be set to \"yes\".", elementName, attributeName); + } + + public static Message BAFunctionsPayloadRequiredInUXContainer(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.BAFunctionsPayloadRequiredInUXContainer, "The BAFunctions DLL Payload element must be located inside the BootstrapperApplication container."); + } + + public static Message MissingDNCPrereq() + { + return Message(null, Ids.MissingDNCPrereq, "There must be at least one PrereqPackage when using the DotNetCoreBootstrapperApplicationHost with SelfContainedDeployment set to \"no\"."); + } + + public static Message MissingMBAPrereq() + { + return Message(null, Ids.MissingMBAPrereq, "There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups."); + } + + public static Message MultipleBAFunctions(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.MultipleBAFunctions, "WixStandardBootstrapperApplication doesn't support multiple BAFunctions DLLs."); + } + + public static Message MultiplePrereqLicenses(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.MultiplePrereqLicenses, "There may only be one package in the bundle that has either the PrereqLicenseFile attribute or the PrereqLicenseUrl attribute."); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Error, (int)id, resourceManager, resourceName, args); + } + + public enum Ids + { + AttributeRequiresPrereqPackage = 6801, + MissingMBAPrereq = 6802, + MultiplePrereqLicenses = 6803, + MultipleBAFunctions = 6804, + BAFunctionsPayloadRequiredInUXContainer = 6805, + MissingDNCPrereq = 6806, + } + } +} diff --git a/src/ext/Bal/wixext/BalExtensionData.cs b/src/ext/Bal/wixext/BalExtensionData.cs new file mode 100644 index 00000000..55daf005 --- /dev/null +++ b/src/ext/Bal/wixext/BalExtensionData.cs @@ -0,0 +1,30 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Extensibility; + + /// + /// The WiX Toolset Bal Extension. + /// + public sealed class BalExtensionData : BaseExtensionData + { + /// + /// Gets the default culture. + /// + /// The default culture. + public override string DefaultCulture => "en-US"; + + public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) + { + symbolDefinition = BalSymbolDefinitions.ByName(name); + return symbolDefinition != null; + } + + public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) + { + return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", symbolDefinitions); + } + } +} diff --git a/src/ext/Bal/wixext/BalExtensionFactory.cs b/src/ext/Bal/wixext/BalExtensionFactory.cs new file mode 100644 index 00000000..0bfb6c5f --- /dev/null +++ b/src/ext/Bal/wixext/BalExtensionFactory.cs @@ -0,0 +1,18 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Collections.Generic; + using WixToolset.Extensibility; + + public class BalExtensionFactory : BaseExtensionFactory + { + protected override IReadOnlyCollection ExtensionTypes => new[] + { + typeof(BalCompiler), + typeof(BalExtensionData), + typeof(BalBurnBackendExtension), + }; + } +} diff --git a/src/ext/Bal/wixext/BalWarnings.cs b/src/ext/Bal/wixext/BalWarnings.cs new file mode 100644 index 00000000..18b25062 --- /dev/null +++ b/src/ext/Bal/wixext/BalWarnings.cs @@ -0,0 +1,31 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using System.Resources; + using WixToolset.Data; + + public static class BalWarnings + { + public static Message UnmarkedBAFunctionsDLL(SourceLineNumber sourceLineNumbers) + { + return Message(sourceLineNumbers, Ids.UnmarkedBAFunctionsDLL, "WixStandardBootstrapperApplication doesn't automatically load BAFunctions.dll. Use the bal:BAFunctions attribute to indicate that it should be loaded."); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); + } + + private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) + { + return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, resourceManager, resourceName, args); + } + + public enum Ids + { + UnmarkedBAFunctionsDLL = 6501, + } + } +} diff --git a/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs new file mode 100644 index 00000000..90865621 --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/BalSymbolDefinitions.cs @@ -0,0 +1,80 @@ +// 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. + +namespace WixToolset.Bal +{ + using System; + using WixToolset.Data; + using WixToolset.Data.Burn; + + public enum BalSymbolDefinitionType + { + WixBalBAFactoryAssembly, + WixBalBAFunctions, + WixBalCondition, + WixBalPackageInfo, + WixDncOptions, + WixMbaPrereqInformation, + WixStdbaOptions, + WixStdbaOverridableVariable, + } + + public static partial class BalSymbolDefinitions + { + public static readonly Version Version = new Version("4.0.0"); + + public static IntermediateSymbolDefinition ByName(string name) + { + if (!Enum.TryParse(name, out BalSymbolDefinitionType type)) + { + return null; + } + + return ByType(type); + } + + public static IntermediateSymbolDefinition ByType(BalSymbolDefinitionType type) + { + switch (type) + { + case BalSymbolDefinitionType.WixBalBAFactoryAssembly: + return BalSymbolDefinitions.WixBalBAFactoryAssembly; + + case BalSymbolDefinitionType.WixBalBAFunctions: + return BalSymbolDefinitions.WixBalBAFunctions; + + case BalSymbolDefinitionType.WixBalCondition: + return BalSymbolDefinitions.WixBalCondition; + + case BalSymbolDefinitionType.WixBalPackageInfo: + return BalSymbolDefinitions.WixBalPackageInfo; + + case BalSymbolDefinitionType.WixDncOptions: + return BalSymbolDefinitions.WixDncOptions; + + case BalSymbolDefinitionType.WixMbaPrereqInformation: + return BalSymbolDefinitions.WixMbaPrereqInformation; + + case BalSymbolDefinitionType.WixStdbaOptions: + return BalSymbolDefinitions.WixStdbaOptions; + + case BalSymbolDefinitionType.WixStdbaOverridableVariable: + return BalSymbolDefinitions.WixStdbaOverridableVariable; + + default: + throw new ArgumentOutOfRangeException(nameof(type)); + } + } + + static BalSymbolDefinitions() + { + WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); + } + } +} diff --git a/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs new file mode 100644 index 00000000..52042e4c --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.FilePath), IntermediateFieldType.String), + }, + typeof(WixBalBAFactoryAssemblySymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixBalBAFactorySymbolFields + { + PayloadId, + FilePath, + } + + public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol + { + public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null) + { + } + + public WixBalBAFactoryAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalBAFactorySymbolFields index] => this.Fields[(int)index]; + + public string PayloadId + { + get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value); + } + + public string FilePath + { + get => this.Fields[(int)WixBalBAFactorySymbolFields.FilePath].AsString(); + set => this.Set((int)WixBalBAFactorySymbolFields.FilePath, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs new file mode 100644 index 00000000..19c7602d --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/WixBalBAFunctionsSymbol.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixBalBAFunctions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalBAFunctions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.PayloadId), IntermediateFieldType.String), + }, + typeof(WixBalBAFunctionsSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixBalBAFunctionsSymbolFields + { + PayloadId, + } + + public class WixBalBAFunctionsSymbol : IntermediateSymbol + { + public WixBalBAFunctionsSymbol() : base(BalSymbolDefinitions.WixBalBAFunctions, null, null) + { + } + + public WixBalBAFunctionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFunctions, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalBAFunctionsSymbolFields index] => this.Fields[(int)index]; + + public string PayloadId + { + get => this.Fields[(int)WixBalBAFunctionsSymbolFields.PayloadId].AsString(); + set => this.Set((int)WixBalBAFunctionsSymbolFields.PayloadId, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs new file mode 100644 index 00000000..c2527fbc --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/WixBalConditionSymbol.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixBalCondition = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalCondition.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Condition), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Message), IntermediateFieldType.String), + }, + typeof(WixBalConditionSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixBalConditionSymbolFields + { + Condition, + Message, + } + + public class WixBalConditionSymbol : IntermediateSymbol + { + public WixBalConditionSymbol() : base(BalSymbolDefinitions.WixBalCondition, null, null) + { + } + + public WixBalConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalCondition, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalConditionSymbolFields index] => this.Fields[(int)index]; + + public string Condition + { + get => this.Fields[(int)WixBalConditionSymbolFields.Condition].AsString(); + set => this.Set((int)WixBalConditionSymbolFields.Condition, value); + } + + public string Message + { + get => this.Fields[(int)WixBalConditionSymbolFields.Message].AsString(); + set => this.Set((int)WixBalConditionSymbolFields.Message, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs b/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs new file mode 100644 index 00000000..b09cb191 --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/WixBalPackageInfoSymbol.cs @@ -0,0 +1,55 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixBalPackageInfo = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixBalPackageInfo.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.DisplayInternalUICondition), IntermediateFieldType.String), + }, + typeof(WixBalPackageInfoSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixBalPackageInfoSymbolFields + { + PackageId, + DisplayInternalUICondition, + } + + public class WixBalPackageInfoSymbol : IntermediateSymbol + { + public WixBalPackageInfoSymbol() : base(BalSymbolDefinitions.WixBalPackageInfo, null, null) + { + } + + public WixBalPackageInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalPackageInfo, sourceLineNumber, id) + { + } + + public IntermediateField this[WixBalPackageInfoSymbolFields index] => this.Fields[(int)index]; + + public string PackageId + { + get => this.Fields[(int)WixBalPackageInfoSymbolFields.PackageId].AsString(); + set => this.Set((int)WixBalPackageInfoSymbolFields.PackageId, value); + } + + public string DisplayInternalUICondition + { + get => this.Fields[(int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition].AsString(); + set => this.Set((int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition, value); + } + } +} diff --git a/src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs new file mode 100644 index 00000000..b9a41c21 --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/WixDncOptionsSymbol.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixDncOptions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number), + }, + typeof(WixDncOptionsSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixDncOptionsSymbolFields + { + SelfContainedDeployment, + } + + public class WixDncOptionsSymbol : IntermediateSymbol + { + public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null) + { + } + + public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id) + { + } + + public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index]; + + public int SelfContainedDeployment + { + get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber(); + set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs b/src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs new file mode 100644 index 00000000..e4d78da0 --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/WixMbaPrereqInformationSymbol.cs @@ -0,0 +1,63 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String), + new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String), + }, + typeof(WixMbaPrereqInformationSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixMbaPrereqInformationSymbolFields + { + PackageId, + LicenseFile, + LicenseUrl, + } + + public class WixMbaPrereqInformationSymbol : IntermediateSymbol + { + public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null) + { + } + + public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id) + { + } + + public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index]; + + public string PackageId + { + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value); + } + + public string LicenseFile + { + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value); + } + + public string LicenseUrl + { + get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString(); + set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs b/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs new file mode 100644 index 00000000..cb2694da --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/WixStdbaOptionsSymbol.cs @@ -0,0 +1,79 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixStdbaOptions = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixStdbaOptions.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressOptionsUI), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressDowngradeFailure), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressRepair), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.ShowVersion), IntermediateFieldType.Number), + new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SupportCacheOnly), IntermediateFieldType.Number), + }, + typeof(WixStdbaOptionsSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixStdbaOptionsSymbolFields + { + SuppressOptionsUI, + SuppressDowngradeFailure, + SuppressRepair, + ShowVersion, + SupportCacheOnly, + } + + public class WixStdbaOptionsSymbol : IntermediateSymbol + { + public WixStdbaOptionsSymbol() : base(BalSymbolDefinitions.WixStdbaOptions, null, null) + { + } + + public WixStdbaOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOptions, sourceLineNumber, id) + { + } + + public IntermediateField this[WixStdbaOptionsSymbolFields index] => this.Fields[(int)index]; + + public int SuppressOptionsUI + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressOptionsUI].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressOptionsUI, value); + } + + public int SuppressDowngradeFailure + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure, value); + } + + public int SuppressRepair + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressRepair].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressRepair, value); + } + + public int ShowVersion + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.ShowVersion].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.ShowVersion, value); + } + + public int SupportCacheOnly + { + get => this.Fields[(int)WixStdbaOptionsSymbolFields.SupportCacheOnly].AsNumber(); + set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs b/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs new file mode 100644 index 00000000..1d84d1aa --- /dev/null +++ b/src/ext/Bal/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs @@ -0,0 +1,47 @@ +// 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. + +namespace WixToolset.Bal +{ + using WixToolset.Data; + using WixToolset.Bal.Symbols; + + public static partial class BalSymbolDefinitions + { + public static readonly IntermediateSymbolDefinition WixStdbaOverridableVariable = new IntermediateSymbolDefinition( + BalSymbolDefinitionType.WixStdbaOverridableVariable.ToString(), + new[] + { + new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableSymbolFields.Name), IntermediateFieldType.String), + }, + typeof(WixStdbaOverridableVariableSymbol)); + } +} + +namespace WixToolset.Bal.Symbols +{ + using WixToolset.Data; + + public enum WixStdbaOverridableVariableSymbolFields + { + Name, + } + + public class WixStdbaOverridableVariableSymbol : IntermediateSymbol + { + public WixStdbaOverridableVariableSymbol() : base(BalSymbolDefinitions.WixStdbaOverridableVariable, null, null) + { + } + + public WixStdbaOverridableVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id) + { + } + + public IntermediateField this[WixStdbaOverridableVariableSymbolFields index] => this.Fields[(int)index]; + + public string Name + { + get => this.Fields[(int)WixStdbaOverridableVariableSymbolFields.Name].AsString(); + set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value); + } + } +} \ No newline at end of file diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj new file mode 100644 index 00000000..00451403 --- /dev/null +++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj @@ -0,0 +1,39 @@ + + + + + + netstandard2.0 + WixToolset.Bal + WiX Toolset Bal Extension + WiX Toolset Bal Extension + embedded + $(MSBuildThisFileName).nuspec + true + Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) + + + + + + + + + + + + + + + + + + + + + + $(OutputPath)..\ + $(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory) + + + diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec new file mode 100644 index 00000000..d9e704ae --- /dev/null +++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec @@ -0,0 +1,26 @@ + + + + $id$ + $version$ + $authors$ + $authors$ + MS-RL + https://github.com/wixtoolset/Bal.wixext + false + $title$ + $description$ + $copyright$ + + + + + + + + + + + + + diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets b/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets new file mode 100644 index 00000000..70c5a19c --- /dev/null +++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.targets @@ -0,0 +1,11 @@ + + + + + + $(MSBuildThisFileDirectory)..\tools\WixToolset.Bal.wixext.dll + + + + + diff --git a/src/ext/Bal/wixlib/BalExtension_arm64.wxs b/src/ext/Bal/wixlib/BalExtension_arm64.wxs new file mode 100644 index 00000000..1b9e11d2 --- /dev/null +++ b/src/ext/Bal/wixlib/BalExtension_arm64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Bal/wixlib/BalExtension_platform.wxi b/src/ext/Bal/wixlib/BalExtension_platform.wxi new file mode 100644 index 00000000..33122fb2 --- /dev/null +++ b/src/ext/Bal/wixlib/BalExtension_platform.wxi @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/wixlib/BalExtension_x64.wxs b/src/ext/Bal/wixlib/BalExtension_x64.wxs new file mode 100644 index 00000000..69a597ae --- /dev/null +++ b/src/ext/Bal/wixlib/BalExtension_x64.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Bal/wixlib/BalExtension_x86.wxs b/src/ext/Bal/wixlib/BalExtension_x86.wxs new file mode 100644 index 00000000..3cdd4015 --- /dev/null +++ b/src/ext/Bal/wixlib/BalExtension_x86.wxs @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/ext/Bal/wixlib/Dnc.wxs b/src/ext/Bal/wixlib/Dnc.wxs new file mode 100644 index 00000000..d777c473 --- /dev/null +++ b/src/ext/Bal/wixlib/Dnc.wxs @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/wixlib/Mba.wxs b/src/ext/Bal/wixlib/Mba.wxs new file mode 100644 index 00000000..2d407c88 --- /dev/null +++ b/src/ext/Bal/wixlib/Mba.wxs @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj new file mode 100644 index 00000000..fdcc7475 --- /dev/null +++ b/src/ext/Bal/wixlib/bal.wixproj @@ -0,0 +1,36 @@ + + + + Library + true + en-us + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/wixlib/caDecor.wxi b/src/ext/Bal/wixlib/caDecor.wxi new file mode 100644 index 00000000..b1711518 --- /dev/null +++ b/src/ext/Bal/wixlib/caDecor.wxi @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/wixlib/wixstdba.wxs b/src/ext/Bal/wixlib/wixstdba.wxs new file mode 100644 index 00000000..8181b9b4 --- /dev/null +++ b/src/ext/Bal/wixlib/wixstdba.wxs @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl new file mode 100644 index 00000000..abd35ac7 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1028/mbapreq.wxl @@ -0,0 +1,27 @@ + + + + + + [WixBundleName] 安裝程式 + [WixBundleName] 安裝程式需要 Microsoft .NET Framework + 您確定要取消嗎? + 安裝程式說明 + /passive | /quiet - 顯示最基本的 UI 但不顯示提示，或者不顯示 UI 也 + 不顯示提示。預設會顯示 UI 和所有提示。 + +/norestart - 隱藏任何重新啟動嘗試。根據預設，UI 會在重新啟動之前提示。 +/log log.txt - 記錄至特定檔案。預設會在 %TEMP% 建立記錄檔。 + 關閉(&C) + 請按一下 「接受並安裝」5D; 按鈕，接受 Microsoft .NET Framework <a href="#">授權合約</a>。 + 接受並安裝(&A) + 拒絕(&D) + 安裝進度 + 正在處理: + 取消(&) + 安裝失敗 + 一或多個問題導致安裝失敗。請修正這些問題，然後再重試安裝。如需詳細資訊，請查看<a href="#">記錄檔</a>。 + 必須重新啟動電腦，才能完成軟體的復原。 + 重新啟動(&R) + 關閉(&C) + diff --git a/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl new file mode 100644 index 00000000..e28b4f74 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1029/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + Instalace produktu [WixBundleName] + Pro instalaci produktu [WixBundleName] je vyžadováno rozhraní Microsoft .NET Framework. + Opravdu chcete akci zrušit? + Nápověda k instalaci + /passive | /quiet - Zobrazí minimální uživatelské rozhraní bez jakýchkoli + výzev, nebo nezobrazí žádné uživatelské rozhraní ani žádné výzvy. Ve výchozím + nastavení se jak uživatelské rozhraní, tak i všechny výzvy zobrazují. + +/norestart - Potlačí jakékoli pokusy o restartování. Ve výchozím nastavení + se v uživatelském rozhraní před restartováním zobrazí výzva. +/log log.txt - Nastaví, že se má zapisovat do konkrétního souboru protokolu. + Ve výchozím nastavení je soubor protokolu vytvořen v umístění %TEMP%. + &Zavřít + Kliknutím na tlačítko Přijmout a nainstalovat přijmete <a href="#">licenční podmínky</a> rozhraní Microsoft .NET Framework. + &Přijmout a instalovat + &Odmítnout + Průběh instalace + Probíhá zpracování: + &Storno + Instalace se nezdařila + Byly zjištěny problémy, kvůli kterým se instalaci nepodařilo dokončit. Odstraňte tyto problémy a potom instalaci opakujte. Další informace naleznete v <a href="#">souboru protokolu</a>. + Aby bylo možné zrušení instalace softwaru dokončit, je nutné počítač restartovat. + &Restartovat + &Zavřít + diff --git a/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl new file mode 100644 index 00000000..a531467a --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1030/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + Installation af [WixBundleName] + Microsoft .NET Framework skal være installeret i forbindelse med Installationen af [WixBundleName] + Er du sikker på, at du vil annullere? + Hjælp til installation + /passive | /quiet - viser en minimal brugergrænseflade uden prompter eller + viser ingen brugergrænseflade og ingen prompter. + Brugergrænsefladen og alle prompter vises som standard. + +/norestart - skjuler forsøg på genstart. Der vises som standard en + forespørgsel i brugergrænsefladen, før der genstartes. +/log log.txt - logfører til en bestemt fil. Der oprettes som standard en + logfil i %TEMP%. + &Luk + Klik på knappen "Acceptér og installér" for at acceptere <a href="#">licensvilkårene</a> for Microsoft .NET Framework. + &Acceptér og installér + &Afvis + Status for installation + Behandler: + &Annuller + Installationen blev ikke gennemført + Installationen blev ikke gennemført på grund af et eller flere problemer. Løs problemerne, og prøv derefter at installere igen. Se <a href="#">logfilen</a> for at få flere oplysninger. + Du skal genstarte computeren for at fuldføre annulleringen af opdateringen af softwaren. + &Genstart + &Luk + diff --git a/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl new file mode 100644 index 00000000..ff8111f9 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1031/mbapreq.wxl @@ -0,0 +1,33 @@ + + + + + + + + [WixBundleName]-Setup + Für das [WixBundleName]-Setup ist Microsoft .NET Framework erforderlich. + Sind Sie sicher, dass Sie den Vorgang abbrechen möchten? + Setup-Hilfe + /passive | /quiet - zeigt eine minimale Benutzeroberfläche ohne + Eingabeaufforderungen oder keine Benutzeroberfläche und keine + Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und + alle Eingabeaufforderungen angezeigt. + +/norestart - unterdrückt alle Neustartversuche. Standardmäßig fordert die + Benutzeroberfläche zum Bestätigen eines Neustarts auf. +/log log.txt - erstellt das Protokoll in einer bestimmten Datei. + Standardmäßig wird die Protokolldatei in "%TEMP%" erstellt. + &Schließen + Klicken Sie auf die Schaltfläche "Akzeptieren und installieren", um den Microsoft .NET Framework <a href="#">-Lizenzbedingungen</a> zuzustimmen. + &Akzeptieren und installieren + &Ablehnen + Setup-Status + Verarbeitung: + &Abbrechen + Setup-Fehler + Beim Setup ist aufgrund mindestens eines Problems ein Fehler aufgetreten. Beheben Sie die Probleme, und wiederholen Sie das Setup. Weitere Informationen finden Sie in der <a href="#">Protokolldatei</a>. + Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen. + &Neu starten + &Schließen + diff --git a/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl new file mode 100644 index 00000000..bc3703a3 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1032/mbapreq.wxl @@ -0,0 +1,32 @@ + + + + + + Εγκατάσταση του [WixBundleName] + Για την εγκατάσταση του [WixBundleName] απαιτείται το Microsoft .NET Framework + Είστε βέβαιοι ότι θέλετε να γίνει ακύρωση; + Βοήθεια για την εγκατάσταση + /passive | /quiet - εμφανίζει ελάχιστο περιεχόμενο του περιβάλλοντος εργασίας + χρήστη χωρίς μηνύματα ή δεν εμφανίζει περιβάλλον εργασίας χρήστη και + μηνύματα. Από προεπιλογή, εμφανίζονται όλα τα μηνύματα και το περιβάλλον + εργασίας χρήστη. + +/norestart - αποκρύπτει οποιεσδήποτε προσπάθειες για επανεκκίνηση. Από + προεπιλογή, το περιβάλλον εργασίας χρήστη θα εμφανίσει μήνυμα πριν από την + επανεκκίνηση. +/log log.txt - πραγματοποιεί καταγραφή σε ένα συγκεκριμένο αρχείο. Από + προεπιλογή, δημιουργείται ένα αρχείο καταγραφής στο %TEMP%. + &Κλείσιμο + Κάντε κλικ στο κουμπί "Αποδοχή και εγκατάσταση" για να αποδεχτείτε τους <a href="#">όρους της άδειας χρήσης</a> του Microsoft .NET Framework. + &Αποδοχή και εγκατάσταση + &Απόρριψη + Πρόοδος εγκατάστασης + Επεξεργασία: + &Άκυρο + Αποτυχία εγκατάστασης + Ένα ή περισσότερα προβλήματα προκάλεσαν την αποτυχία της εγκατάστασης. Διορθώστε τα προβλήματα και μετά επαναλάβετε την εγκατάσταση. Για περισσότερες πληροφορίες, ανατρέξτε στο <a href="#">αρχείο καταγραφής</a>. + Για να ολοκληρωθεί η επαναφορά του λογισμικού, πρέπει να κάνετε επανεκκίνηση του υπολογιστή. + &Επανεκκίνηση + &Κλείσιμο + diff --git a/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl new file mode 100644 index 00000000..859e5b23 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1035/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] -asennus + Microsoft .NET Framework tarvitaan [WixBundleName] -asennusta varten + Haluatko varmasti peruuttaa? + Asennusohjelman ohje + /passive | /quiet - näyttää mahdollisimman vähän käyttöliittymästä; ei + kehotteita tai ei käyttöliittymää ja kehotteita. Oletusarvoisesti + käyttöliittymä ja kaikki kehotteet näytetään. + +/norestart - estää uudelleenkäynnistysyritykset. Oletusarvoisesti + käyttöliittymä kysyy ennen uudelleenkäynnistystä. +/log loki.txt - kirjaa lokitiedot erityiseen tiedostoon. Oletusarvoisesti + lokitiedosto luodaan %TEMP%-kansioon. + &Sulje + Hyväksy Microsoft .NET Framework -ohjelman <a href="#">käyttöoikeusehdot</a> valitsemalla Hyväksy ja asenna. + &Hyväksy ja asenna + &Hylkää + Asennuksen edistyminen + Käsitellään: + &Peruuta + Asennus epäonnistui + Asennus epäonnistui yhdestä tai useammasta syystä. Korjaa ongelmat ja yritä suorittaa asennus sitten uudelleen. Lisätietoja on <a href="#">lokitiedostossa</a>. + Tietokone täytyy käynnistää uudelleen ohjelmiston palautuksen viimeistelemiseksi. + &Käynnistä uudelleen + &Sulje + diff --git a/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl new file mode 100644 index 00000000..f67dfa8e --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1036/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + Installation de [WixBundleName] + Microsoft .NET Framework requis pour l'installation de [WixBundleName] + Êtes-vous sûr de vouloir annuler ? + Aide de l'installation + /passive | /quiet - affiche une interface minimale sans invites ou n'affiche + aucune interface ni aucune invite. Par défaut, l'interface et toutes les + invites sont affichées. + +/norestart - annule toute tentative de redémarrage. Par défaut, l'interface + affiche une invite avant de redémarrer. +/log journal.txt - consigne les entrées de journal dans un fichier spécifique. + Par défaut, un fichier journal est créé dans %TEMP%. + &Fermer + Cliquez sur le bouton « Accepter et installer » pour accepter les <a href="#">termes du contrat de licence</a> Microsoft .NET Framework. + &Accepter et installer + &Refuser + Progression de l'installation + Traitement en cours : + &Annuler + L'installation a échoué + L'installation a échoué pour une ou plusieurs raisons. Corrigez les problèmes et recommencez l'installation. Pour plus d'informations, consultez le <a href="#">fichier journal</a>. + Vous devez redémarrer votre ordinateur pour effectuer la restauration du logiciel. + &Redémarrer + &Fermer + diff --git a/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl new file mode 100644 index 00000000..6a4b109d --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1038/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] telepítő + A(z) [WixBundleName] telepítéséhez Microsoft .NET-keretrendszer szükséges + Biztosan megszakítja? + A telepítő súgója + /passive | /quiet - Minimális felhasználói felület megjelenítése kérdések + nélkül, illetve felhasználói felület és kérdések megjelenítése nélküli + telepítés. Alapesetben a felhasználói felület és minden kérdés megjelenik. + +/norestart - Az újraindítási kérések elrejtése. Alapesetben a felhasználói + felületen megjelennek az újraindítási kérések. +/log naplo.txt - Naplózás a megadott fájlba. Alapesetben a naplófájl a %TEMP% + könyvtárban jön létre. + &Bezárás + A Microsoft .NET-keretrendszer <a href="#">licencszerződésének</a> elfogadásához kattintson az „Elfogadás és telepítés” gombra. + &Elfogadás és telepítés + &Elutasítás + Telepítési folyamat + Feldolgozás: + &Mégse + A telepítés nem sikerült + Legalább egy olyan hiba lépett fel, amely a telepítés meghiúsulását okozta. Hárítsa el a hibákat, majd futtassa újra a telepítőt. További információt a <a href="#">naplófájlban </a> talál. + A szoftver visszaállításának befejezéséhez újra kell indítania a számítógépet. + &Újraindítás + &Bezárás + diff --git a/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl new file mode 100644 index 00000000..f57d58e5 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1040/mbapreq.wxl @@ -0,0 +1,31 @@ + + + + + + Installazione di [WixBundleName] + Microsoft .NET Framework necessario per l'installazione di [WixBundleName] + Annullare? + Guida dell'installazione + /passive | /quiet - visualizza l'interfaccia utente minima senza istruzioni + oppure non visualizza né l'interfaccia utente né le istruzioni. Per + impostazione predefinita vengono visualizzate interfaccia utente e + istruzioni. + +/norestart - elimina eventuali tentativi di riavvio. Per impostazione + predefinita l'interfaccia utente chiede istruzioni prima del riavvio. +/log log.txt - registra in un file specifico. Per impostazione predefinita un + file di log viene creato in %TEMP%. + &Chiudi + Fare clic sul pulsante "Accetta e installa" per accettare le <a href="#">condizioni di licenza</a> di Microsoft .NET Framework. + &Accetta e installa + &Rifiuta + Stato installazione + Elaborazione in corso: + &Annulla + Installazione non riuscita + L'installazione non è riuscita a causa di uno o più problemi. Risolvere i problemi e provare di nuovo l'installazione. Per ulteriori informazioni vedere il <a href="#">file di log</a>. + È necessario riavviare il computer per completare il rollback del software. + &Riavvia + &Chiudi + diff --git a/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl new file mode 100644 index 00000000..3fe7b9b3 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1041/mbapreq.wxl @@ -0,0 +1,27 @@ + + + + + + [WixBundleName] セットアップ + [WixBundleName] セットアップには Microsoft .NET Framework が必要です + 取り消しますか? + セットアップのヘルプ + /passive | /quiet - 最小の UI だけを表示してプロンプトは表示しないか、UI + もプロンプトも表示しません。 既定では、UI とすべてのプロンプトが表示されます。 + +/norestart - 再起動の試みをすべて抑制します。既定では、再起動の前に UI によりプロンプトが表示されます。 +/log log.txt - 特定のファイルにログを記録します。既定では、%TEMP% にログ ファイルが作成されます。 + 閉じる(&C) + Microsoft .NET Framework の<a href="#">ライセンス条項</a>に同意する場合は、［同意してインストール］5D; ボタンをクリックします。 + 同意してインストール(&A) + 同意しない(&) + セットアップの進行状況 + 処理中: + キャンセル(&C) + セットアップに失敗しました + 1 つ以上の問題が原因でセットアップに失敗しました。問題を解決してからセットアップをやり直してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。 + ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。 + 再起動(&R) + 閉じる(&C) + diff --git a/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl new file mode 100644 index 00000000..0f53dcc3 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1042/mbapreq.wxl @@ -0,0 +1,27 @@ + + + + + + [WixBundleName] 설치 + [WixBundleName] 설치에 필요한 Microsoft .NET Framework + 취소하시겠습니까? + 설치 도움말 + /passive | /quiet - 메시지 없이 최소 UI를 표시하거나 UI와 메시지를 전혀 + 표시하지 않습니다. 기본적으로 UI 및 모든 메시지는 표시됩니다. + +/norestart - 다시 시작하려는 시도를 무시합니다. 기본적으로 UI는 다시 시작하기 전에 메시지를 표시합니다. +/log log.txt - 특정 파일에 기록합니다. 기본적으로 로그 파일이 %TEMP%에 생성됩니다. + 닫기(&C) + Microsoft .NET Framework <a href="#">사용 조건</a>에 동의하려면 "동의 및 설치"를 클릭하십시오. + 동의 및 설치(&A) + 동의 안 함(&D) + 설치 진행률 + 처리 중: + 취소(&C) + 설치 실패 + 하나 이상의 문제로 인해 설치에 실패했습니다. 문제를 수정하고 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오. + 소프트웨어의 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. + 다시 시작(&R) + 닫기(&C) + diff --git a/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl new file mode 100644 index 00000000..f4a2c78c --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1043/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] Installatie + Microsoft .NET Framework is vereist voor installatie [WixBundleName] + Weet u zeker dat u de installatie wilt annuleren? + Help bij Setup + /passive | /quiet - geeft een minimale gebruikersinterface weer zonder prompts + of geeft geen gebruikersinterface en geen prompts weer. Gebruikersinterface + en alle prompts worden standaard weergegeven. + +/norestart - pogingen tot opnieuw opstarten onderdrukken. + Gebruikersinterface vraagt standaard alvorens opnieuw op te starten. +/log log.txt - registreert gegevens in een specifiek bestand. Een logbestand + wordt standaard in %TEMP% gemaakt. + &Sluiten + Klik op de knop 'Accepteren en installeren' om de <a href="#">licentievoorwaarden</a> van het Microsoft .NET Framework te accepteren. + &Accepteren en installeren + &Weigeren + Voortgang van de installatie + Verwerken: + &Annuleren + Installatie mislukt + Er zijn een of meer fouten opgetreden waardoor de installatie is mislukt. Corrigeer de problemen en voer Setup opnieuw uit. Raadpleeg het <a href="#">log boekbestand</a> voor meer informatie. + U moet uw computer opnieuw opstarten om het terugdraaien van de software te voltooien. + &Opnieuw opstarten + &Sluiten + diff --git a/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl new file mode 100644 index 00000000..da5c8283 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1044/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] Installasjonsprogram + Microsoft .NET Framework kreves for [WixBundleName]-installasjon + Er du sikker på at du vil avbryte? + Installasjonshjelp + /passive | /quiet - viser minimalt brukergrensesnitt uten ledetekster, eller + ikke noe brukergrensesnitt og ingen ledetekster. Som standard vises + brukergrensesnitt og alle ledetekster. + +/norestart - undertrykker alle forsøk på omstart. Som standard spør + brukergrensesnittet før omstart. +/log log.txt - skriver logg til en bestemt fil. Som standard opprettes en + loggfil i %TEMP%. + &Lukk + Klikk Godta og installer for å godta<a href="#">lisensvilkårene</a> for Microsoft .NET Framework. + &Godta og installer + &Avslå + Fremdrift for installasjon + Behandler: + &Avbryt + Installasjon mislyktes + Ett eller flere problemer var årsak til at installasjonen mislyktes. Løs problemene, og installer på nytt. Du finner flere opplysninger i <a href="#">loggfilen</a>. + Du må starte datamaskinen på nytt for å fullføre tilbakerullingen av programvaren. + &Start på nytt + &Lukk + diff --git a/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl new file mode 100644 index 00000000..7aca87c2 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1045/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + Instalator programu [WixBundleName] + Do zainstalowania programu [WixBundleName] jest wymagany program Microsoft .NET Framework + Czy na pewno chcesz anulować? + Pomoc instalatora + /passive | /quiet - wyświetla minimalny interfejs użytkownika bez monitów + lub nie wyświetla interfejsu użytkownika ani monitów. Domyślnie jest + wyświetlany interfejs użytkownika i wszystkie monity. + +/norestart - pomija wszelkie próby ponownego uruchomienia. Domyślnie + interfejs użytkownika będzie wyświetlał monit przed ponownym uruchomieniem. +/log log.txt - zapisuje wpisy dziennika do określonego pliku. + Domyślnie plik dziennika jest tworzony w folderze %TEMP%. + &Zamknij + Kliknij przycisk Zaakceptuj i zainstaluj, aby zaakceptować <a href="#">warunki licencji</a> programu Microsoft .NET Framework. + &Zaakceptuj i zainstaluj + &Odrzuć + Postęp instalacji + Trwa przetwarzanie: + &Anuluj + Instalacja nie powiodła się + Co najmniej jeden problem spowodował niepowodzenie instalacji. Usuń problemy, a następnie ponów próbę instalacji. Aby uzyskać więcej informacji można znaleźć w <a href="#">pliku dziennika</a>. + Aby zakończyć wycofywanie oprogramowania, musisz ponownie uruchomić komputer. + &Uruchom ponownie + &Zamknij + diff --git a/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl new file mode 100644 index 00000000..be185502 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1046/mbapreq.wxl @@ -0,0 +1,29 @@ + + + + + + [WixBundleName] Instalação + Microsoft .NET Framework é necessário para instalação do [WixBundleName] + Tem certeza de que deseja cancelar? + Ajuda da Instalação + /passive | /quiet - exibe UI mínima sem avisos ou exibe sem UI e + sem avisos. Por padrão a UI e todos avisos são exibidos. + +/norestart - suprime qualquer tentativa de reinicialização. Por padrão a UI + irá solicitar antes de reiniciar. +/log log.txt - logs para um arquivo específico. Por padrão um arquivo de log é + criado em %TEMP%. + &Fechar + Clique o botão "Aceitar e Instalar" para aceitar os termos de licença do Microsoft .NET Framework <a href="#"></a>. + &Aceitar e Instalar + &Recusar + Progresso da Instalação + Processando: + &Cancelar + Falha na Instalação + Um ou mais problemas causaram falha na instalação. Corrija os problemas e tente a instalação novamente. Para mais informações consulte o <a href="#">arquivo de log</a>. + Você deve reiniciar o computador para completar a reversão do software. + &Reiniciar + &Fechar + diff --git a/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl new file mode 100644 index 00000000..a1aec7ed --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1049/mbapreq.wxl @@ -0,0 +1,29 @@ + + + + + + Установка [WixBundleName] + Для установки [WixBundleName] требуется Microsoft .NET Framework + Вы действительно хотите отменить операцию? + Справка по установке + /passive | /quiet - отображение минимального ИП без запросов или работа без ИП + и беззапросов. По умолчанию отображаются ИП и все запросы. + +/norestart - отключение всех попыток перезагрузки. По умолчанию в ИП перед + перезагрузкой отображается запрос. +/log log.txt - запись журнала в указанный файл. По умолчанию файл журнала + создается в папке %TEMP%. + &Закрыть + Нажмите кнопку "Принять и установить", чтобы принять <a href="#">условия лицензии</a> Microsoft .NET Framework. + &Принять и установить + &Отклонить + Выполнение установки + Обработка: + &Отмена + Сбой установки + Не удалось выполнить установку из-за одной или нескольких проблем. Устраните эти проблемы, а затем снова запустите программу установки. Дополнительные сведения см. в <a href="#">файле журнала</a>. + Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. + &Перезагрузить + &Закрыть + diff --git a/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl new file mode 100644 index 00000000..9f0b4711 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1051/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] – inštalácia + Na inštaláciu aplikácie [WixBundleName] sa vyžaduje súčasť Microsoft .NET Framework + Naozaj chcete zrušiť operáciu? + Pomocník pre inštaláciu + /passive | /quiet – zobrazí minimálne používateľské rozhranie bez výziev alebo + nezobrazí žiadne používateľské rozhranie ani výzvy. Predvolene sa + zobrazuje používateľské rozhranie aj všetky výzvy. + +/norestart – zruší všetky pokusy o reštart. Používateľské rozhranie + predvolene zobrazí pred reštartom výzvu. +/log log.txt – urobí záznam do určeného súboru. Súbor denníka sa predvolene + vytvorí v priečinku %TEMP%. + &Zavrieť + Kliknutím na tlačidlo Súhlasiť a inštalovať vyjadrite svoj súhlas s <a href="#">licenčnými podmienkami</a> súčasti Microsoft .NET Framework. + &Súhlasiť a inštalovať + &Odmietnuť + Priebeh inštalácie + Spracúva sa: + &Zrušiť + Inštalácia zlyhala + Inštalácia zlyhala pre jednu alebo viac príčin. Odstráňte problémy a skúste znova spustiť inštaláciu. Ďalšie informácie nájdete v <a href="#">súbore denníka</a>. + Dokončenie všetkých zmien softvéru vyžaduje reštart počítača. + &Reštartovať + &Zavrieť + diff --git a/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl new file mode 100644 index 00000000..72961409 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1053/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName]-installation + Microsoft .NET Framework krävs för installation av [WixBundleName] + Vill du avbryta? + Installationshjälp + /passive | /quiet - visar ett minimalt användargränssnitt utan prompter, + alternativt inget användargränssnitt och inga prompter. Som standard visas + användargränssnitt och samtliga prompter. + +/norestart - hejdar omstart. Som standard visar användargränssnittet en + prompt före omstart. +/log log.txt - skapar logg till en specifik fil. Som standard skapas loggfilen + i %TEMP%. + &Stäng + Klicka på knappen "Godkänn och installera" för att godkänna <a href="#">licensvillkoren</a> för Microsoft .NET Framework. + &Godkänn och installera + &Avbryt + Installationsförlopp + Bearbetar: + &Avbryt + Installationen misslyckades + Installationen misslyckades på grund av ett eller flera problem. Åtgärda problemen och försök igen. Se <a href="#">loggfilen</a> för mer information. + Starta om datorn för att återställa programmet. + &Starta om + &Stäng + diff --git a/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl new file mode 100644 index 00000000..ee52da98 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1055/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] Kurulumu + [WixBundleName] kurulumu için Microsoft .NET Framework gerekir + İptal etmek istediğinizden emin misiniz? + Kurulum Yardımı + /passive | /quiet - komut istemi olmayan olabildiğince küçük bir UI + görüntüler veya komut istemi ve UI görüntülemez. Varsayılan olarak UI + ve tüm komut istemleri görüntülenir. + +/norestart - yeniden başlatma denemelerini engeller. Varsayılan + olarak UI yeniden başlatmadan önce komut isteyecektir. +/log log.txt - belirli bir dosyayı günlük dosyası olarak kullanır. + Varsayılan olarak %TEMP% konumunda bir günlük dosyası oluşturulur. + &Kapat + Microsoft .NET Framework <a href="#">lisans şartlarını</a> kabul etmek için "Kabul Et ve Yükle" düğmesini tıklatın. + &Kabul Et ve Yükle + &Reddet + Kurulum İlerleme Durumu + İşleniyor: + &İptal + Kurulum Başarısız + Bir veya daha fazla sorun kurulumun başarısız olmasına neden oldu. Lütfen sorunları çözün ve kurulumu yeniden deneyin. Daha fazla bilgi için <a href="#">günlük dosyasına</a> bakın. + Yazılım geri alma işlemini tamamlamak için bilgisayarınızı yeniden başlatmanız gerekir. + &Yeniden Başlat + &Kapat + diff --git a/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl new file mode 100644 index 00000000..f3b4bfe5 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/1060/mbapreq.wxl @@ -0,0 +1,30 @@ + + + + + + [WixBundleName] Namestitev + Microsoft .NET Framework, potreben za namestitev paketa [WixBundleName] + Ali ste prepričani, da želite preklicati? + Pomoč za namestitev + /passive | /quiet - prikaže minimalni uporabniški vmesnik brez pozivov ali ne prikaže + uporabniškega vmesnika in pozivov. Privzeto so prikazani uporabniški vmesnik in + vsi pozivi. + +/norestart - skrije vse možnosti za vnovicni zagon. Privzeto uporabniški vmesnik + prikaže poziv pred ponovnim zagonom. +/log log.txt - beleži vnose v dnevnik v doloceno datoteko. Privzeto je datoteko + ustvarjena v mapi %TEMP%. + &Zapri + Kliknite »Sprejmi in namesti« in sprejmite <a href="#">licenčne pogoje</a> za Microsoft .NET Framework. + &Sprejmi in namesti + &Zavrni + Potek namestitve + Obdelovanje: + &Prekliči + Namestitev ni uspela + Namestitev ni uspela zaradi ene ali več težav. Odpravite težave in ponovno zaženite namestitev. Za več informacij glejte <a href="#">dnevniško datoteko</a>. + Za povrnitev prejšnjega stanja programske opreme morate ponovno zagnati računalnik. + &Ponovni zagon + &Zapri + diff --git a/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl new file mode 100644 index 00000000..63cdb418 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/2052/mbapreq.wxl @@ -0,0 +1,27 @@ + + + + + + [WixBundleName] 安装 + [WixBundleName] 安装需要 Microsoft .NET Framework + 是否确实要取消? + 安装程序帮助 + /passive | /quiet - 显示最小的 UI 且无提示，或者不显示 UI 且 + 无提示。默认情况下显示 UI 和所有提示。 + +/norestart - 隐藏任何重启提示。默认情况下 UI 会在重启前提示。 +/log log.txt - 记录到特定文件。默认情况下在 %TEMP% 中创建日志文件。 + 关闭(&C) + 单击“接受并安装”按钮以接受 Microsoft .NET Framework <a href="#">许可证条款</a>。 + 接受并安装(&A) + 拒绝(&D) + 安装进度 + 正在处理: + 取消(&C) + 安装失败 + 一个或多个问题导致安装失败。请解决问题，然后重新尝试安装。有关详情，请查看<a href="#">日志文件</a>。 + 必须重启计算机才能完成软件的回滚。 + 重启(&R) + 关闭(&C) + diff --git a/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl new file mode 100644 index 00000000..6a49ca31 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/2070/mbapreq.wxl @@ -0,0 +1,29 @@ + + + + + + Configuração do [WixBundleName] + O Microsoft .NET Framework é necessário para a configuração do [WixBundleName] + Tem a certeza de que pretende cancelar? + Ajuda da Configuração + /passive | /quiet - apresenta IU mínima sem mensagens ou não apresenta IU nem + mensagens. Por predefinição, são apresentadas a IU e todas as mensagens. + +/norestart - suprimir qualquer tentativa de reinício. Por predefinição, a IU + avisará antes de reiniciar. +/log log.txt - regista num ficheiro específico. Por predefinição, é criado um + ficheiro de registo em %TEMP%. + &Fechar + Clique no botão "Aceitar e Instalar" para aceitar os <a href="#">termos de licenciamento</a> do Microsoft .NET Framework. + &Aceitar e Instalar + &Recusar + Progresso da Configuração + A processar: + &Cancelar + Falha da Configuração + Um ou mais problemas provocaram a falha da configuração. Corrija os problemas e repita a configuração. Para mais informações, consulte o <a href="#">ficheiro de registo</a>. + Tem de reiniciar o computador para concluir a reversão do software. + &Reiniciar + &Fechar + diff --git a/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl new file mode 100644 index 00000000..0290624c --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/3082/mbapreq.wxl @@ -0,0 +1,31 @@ + + + + + + Instalación de [WixBundleName] + La instalación de [WixBundleName] requiere Microsoft .NET Framework + ¿Está seguro de que desea cancelar? + Ayuda del programa de instalación + /passive | /quiet - muestra una interfaz de usuario mínima y no realiza + preguntas, o bien no muestra interfaz de usuario y no realiza preguntas. + De manera predeterminada se muestra la interfaz de usuario completa y se + realizan todas las preguntas necesarias. + +/norestart - suprime cualquier intento de reinicio. De manera predeterminada, + la interfaz de usuario preguntará si se desea reiniciar. +/log log.txt - registra los datos de instalación en un archivo específico. + De manera predeterminada se crea un archivo de registro en %TEMP%. + &Cerrar + Haga clic en el botón "Aceptar e instalar" para aceptar los <a href="#">términos de licencia</a> de Microsoft .NET Framework. + &Aceptar e instalar + &Rechazar + Progreso de la instalación + Procesando: + &Cancelar + Error de la instalación + No se pudo completar la instalación a causa de uno o varios problemas. Corrija los problemas y vuelva a intentar la instalación. Para más información, vea el <a href="#">archivo de registro</a>. + Debe reiniciar el equipo para completar la reversión del software. + &Reiniciar + &Cerrar + diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml b/src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml new file mode 100644 index 00000000..39a38ee0 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/HyperlinkLargeTheme.xml @@ -0,0 +1,109 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + + #(loc.InstallLicenseLinkText) + + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml b/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml new file mode 100644 index 00000000..1dff9d7e --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/HyperlinkSidebarTheme.xml @@ -0,0 +1,120 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + + + #(loc.InstallLicenseLinkText) + + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl new file mode 100644 index 00000000..e6e3f8ab --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.wxl @@ -0,0 +1,61 @@ + + + + + + [WixBundleName] Setup + [WixBundleName] + Welcome + Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit. + Version [WixBundleVersion] + Are you sure you want to cancel? + Previous version + Setup Help + /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or + creates a complete local copy of the bundle in directory. Install is the default. + +/passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + [WixBundleName] <a href="#">license terms</a>. + I &agree to the license terms and conditions + &Options + &Install + &Cancel + Setup Options + Install location: + &Browse + &OK + &Cancel + Setup Progress + Processing: + Initializing... + &Cancel + Modify Setup + &Repair + &Uninstall + &Cancel + Setup Successful + Installation Successfully Completed + Layout Successfully Completed + Repair Successfully Completed + Uninstall Successfully Completed + &Launch + You must restart your computer before you can use the software. + You must restart your computer to complete the removal of the software. + &Restart + &Close + Setup Failed + Setup Failed + Layout Failed + Repair Failed + Uninstall Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + No action was taken as a system reboot is required. + diff --git a/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml new file mode 100644 index 00000000..657db34b --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/HyperlinkTheme.xml @@ -0,0 +1,106 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + #(loc.InstallLicenseLinkText) + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/ext/Bal/wixstdba/Resources/LoremIpsumLicense.rtf b/src/ext/Bal/wixstdba/Resources/LoremIpsumLicense.rtf new file mode 100644 index 00000000..1a183236 Binary files /dev/null and b/src/ext/Bal/wixstdba/Resources/LoremIpsumLicense.rtf differ diff --git a/src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml b/src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml new file mode 100644 index 00000000..3571e13a --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/RtfLargeTheme.xml @@ -0,0 +1,108 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl b/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl new file mode 100644 index 00000000..f73fb994 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/RtfTheme.wxl @@ -0,0 +1,58 @@ + + + + + + [WixBundleName] Setup + [WixBundleName] + Version [WixBundleVersion] + Are you sure you want to cancel? + Previous version + Setup Help + /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or + creates a complete local copy of the bundle in directory. Install is the default. + +/passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + I &agree to the license terms and conditions + &Options + &Install + &Cancel + Setup Options + Install location: + &Browse + &OK + &Cancel + Setup Progress + Processing: + Initializing... + &Cancel + Modify Setup + &Repair + &Uninstall + &Cancel + Setup Successful + Installation Successfully Completed + Layout Successfully Completed + Repair Successfully Completed + Uninstall Successfully Completed + &Launch + You must restart your computer before you can use the software. + You must restart your computer to complete the removal of the software. + &Restart + &Close + Setup Failed + Setup Failed + Layout Failed + Repair Failed + Uninstall Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + No action was taken as a system reboot is required. + diff --git a/src/ext/Bal/wixstdba/Resources/RtfTheme.xml b/src/ext/Bal/wixstdba/Resources/RtfTheme.xml new file mode 100644 index 00000000..d6535bac --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/RtfTheme.xml @@ -0,0 +1,106 @@ + + + + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + + #(loc.InstallAcceptCheckbox) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + #(loc.FailureHyperlinkLogText) + + + + + + + diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.thm b/src/ext/Bal/wixstdba/Resources/dncpreq.thm new file mode 100644 index 00000000..4ae61819 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/dncpreq.thm @@ -0,0 +1,47 @@ + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + #(loc.InstallLicenseTerms) + + + + + + + + + + + + + #(loc.FailureLogLinkText) + + + + + + + diff --git a/src/ext/Bal/wixstdba/Resources/dncpreq.wxl b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl new file mode 100644 index 00000000..d6b73b5f --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/dncpreq.wxl @@ -0,0 +1,29 @@ + + + + + + [WixBundleName] Setup + Microsoft .NET Core required for [WixBundleName] setup + Are you sure you want to cancel? + Setup Help + /passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + Click the "Accept and Install" button to accept the Microsoft .NET Core <a href="#">license terms</a>. + &Accept and Install + &Decline + Setup Progress + Processing: + &Cancel + Setup Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + [WixBundleName] cannot run on this machine. Install the latest updates and/or the latest OS to run in a supported environment. + No action was taken as a system reboot is required. + diff --git a/src/ext/Bal/wixstdba/Resources/logo.png b/src/ext/Bal/wixstdba/Resources/logo.png new file mode 100644 index 00000000..7adc6e11 Binary files /dev/null and b/src/ext/Bal/wixstdba/Resources/logo.png differ diff --git a/src/ext/Bal/wixstdba/Resources/logoSide.png b/src/ext/Bal/wixstdba/Resources/logoSide.png new file mode 100644 index 00000000..308841c5 Binary files /dev/null and b/src/ext/Bal/wixstdba/Resources/logoSide.png differ diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.png b/src/ext/Bal/wixstdba/Resources/mbapreq.png new file mode 100644 index 00000000..c6e9527b Binary files /dev/null and b/src/ext/Bal/wixstdba/Resources/mbapreq.png differ diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.thm b/src/ext/Bal/wixstdba/Resources/mbapreq.thm new file mode 100644 index 00000000..4ae61819 --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/mbapreq.thm @@ -0,0 +1,47 @@ + + + Segoe UI + Segoe UI + Segoe UI + Segoe UI + + + + + + + + + + + + #(loc.InstallLicenseTerms) + + + + + + + + + + + + + #(loc.FailureLogLinkText) + + + + + + + diff --git a/src/ext/Bal/wixstdba/Resources/mbapreq.wxl b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl new file mode 100644 index 00000000..95e3a6ae --- /dev/null +++ b/src/ext/Bal/wixstdba/Resources/mbapreq.wxl @@ -0,0 +1,29 @@ + + + + + + [WixBundleName] Setup + Microsoft .NET Framework required for [WixBundleName] setup + Are you sure you want to cancel? + Setup Help + /passive | /quiet - displays minimal UI with no prompts or displays no UI and + no prompts. By default UI and all prompts are displayed. + +/norestart - suppress any attempts to restart. By default UI will prompt before restart. +/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. + &Close + Click the "Accept and Install" button to accept the Microsoft .NET Framework <a href="#">license terms</a>. + &Accept and Install + &Decline + Setup Progress + Processing: + &Cancel + Setup Failed + One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. + You must restart your computer to complete the rollback of the software. + &Restart + &Close + [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. + No action was taken as a system reboot is required. + diff --git a/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp new file mode 100644 index 00000000..d4bf7b43 --- /dev/null +++ b/src/ext/Bal/wixstdba/WixStandardBootstrapperApplication.cpp @@ -0,0 +1,4264 @@ +// 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. + +#include "precomp.h" +#include "BalBaseBootstrapperApplicationProc.h" +#include "BalBaseBootstrapperApplication.h" + +static const LPCWSTR WIXBUNDLE_VARIABLE_ELEVATED = L"WixBundleElevated"; + +static const LPCWSTR WIXSTDBA_WINDOW_CLASS = L"WixStdBA"; + +static const LPCWSTR WIXSTDBA_VARIABLE_INSTALL_FOLDER = L"InstallFolder"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH = L"LaunchTarget"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID = L"LaunchTargetElevatedId"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS = L"LaunchArguments"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_HIDDEN = L"LaunchHidden"; +static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER = L"LaunchWorkingFolder"; + +static const DWORD WIXSTDBA_ACQUIRE_PERCENTAGE = 30; + +static const LPCWSTR WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION = L"WixBundleFileVersion"; +static const LPCWSTR WIXSTDBA_VARIABLE_LANGUAGE_ID = L"WixStdBALanguageId"; +static const LPCWSTR WIXSTDBA_VARIABLE_RESTART_REQUIRED = L"WixStdBARestartRequired"; +static const LPCWSTR WIXSTDBA_VARIABLE_SHOW_VERSION = L"WixStdBAShowVersion"; +static const LPCWSTR WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI = L"WixStdBASuppressOptionsUI"; + +enum WIXSTDBA_STATE +{ + WIXSTDBA_STATE_INITIALIZING, + WIXSTDBA_STATE_INITIALIZED, + WIXSTDBA_STATE_HELP, + WIXSTDBA_STATE_DETECTING, + WIXSTDBA_STATE_DETECTED, + WIXSTDBA_STATE_PLANNING, + WIXSTDBA_STATE_PLANNED, + WIXSTDBA_STATE_APPLYING, + WIXSTDBA_STATE_CACHING, + WIXSTDBA_STATE_CACHED, + WIXSTDBA_STATE_EXECUTING, + WIXSTDBA_STATE_EXECUTED, + WIXSTDBA_STATE_APPLIED, + WIXSTDBA_STATE_FAILED, +}; + +enum WM_WIXSTDBA +{ + WM_WIXSTDBA_SHOW_HELP = WM_APP + 100, + WM_WIXSTDBA_DETECT_PACKAGES, + WM_WIXSTDBA_PLAN_PACKAGES, + WM_WIXSTDBA_APPLY_PACKAGES, + WM_WIXSTDBA_CHANGE_STATE, + WM_WIXSTDBA_SHOW_FAILURE, +}; + +// This enum must be kept in the same order as the vrgwzPageNames array. +enum WIXSTDBA_PAGE +{ + WIXSTDBA_PAGE_LOADING, + WIXSTDBA_PAGE_HELP, + WIXSTDBA_PAGE_INSTALL, + WIXSTDBA_PAGE_MODIFY, + WIXSTDBA_PAGE_PROGRESS, + WIXSTDBA_PAGE_PROGRESS_PASSIVE, + WIXSTDBA_PAGE_SUCCESS, + WIXSTDBA_PAGE_FAILURE, + COUNT_WIXSTDBA_PAGE, +}; + +// This array must be kept in the same order as the WIXSTDBA_PAGE enum. +static LPCWSTR vrgwzPageNames[] = { + L"Loading", + L"Help", + L"Install", + L"Modify", + L"Progress", + L"ProgressPassive", + L"Success", + L"Failure", +}; + +enum WIXSTDBA_CONTROL +{ + // Welcome page + WIXSTDBA_CONTROL_INSTALL_BUTTON = THEME_FIRST_ASSIGN_CONTROL_ID, + WIXSTDBA_CONTROL_EULA_RICHEDIT, + WIXSTDBA_CONTROL_EULA_LINK, + WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX, + + // Modify page + WIXSTDBA_CONTROL_REPAIR_BUTTON, + WIXSTDBA_CONTROL_UNINSTALL_BUTTON, + + // Progress page + WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, + WIXSTDBA_CONTROL_CACHE_PROGRESS_BAR, + WIXSTDBA_CONTROL_CACHE_PROGRESS_TEXT, + + WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, + WIXSTDBA_CONTROL_EXECUTE_PROGRESS_BAR, + WIXSTDBA_CONTROL_EXECUTE_PROGRESS_TEXT, + WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, + + WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, + WIXSTDBA_CONTROL_OVERALL_PROGRESS_BAR, + WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, + WIXSTDBA_CONTROL_OVERALL_PROGRESS_TEXT, + + WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, + + // Success page + WIXSTDBA_CONTROL_LAUNCH_BUTTON, + WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, + + // Failure page + WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, + WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, + WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, +}; + +static THEME_ASSIGN_CONTROL_ID vrgInitControls[] = { + { WIXSTDBA_CONTROL_INSTALL_BUTTON, L"InstallButton" }, + { WIXSTDBA_CONTROL_EULA_RICHEDIT, L"EulaRichedit" }, + { WIXSTDBA_CONTROL_EULA_LINK, L"EulaHyperlink" }, + { WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX, L"EulaAcceptCheckbox" }, + + { WIXSTDBA_CONTROL_REPAIR_BUTTON, L"RepairButton" }, + { WIXSTDBA_CONTROL_UNINSTALL_BUTTON, L"UninstallButton" }, + + { WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, L"CacheProgressPackageText" }, + { WIXSTDBA_CONTROL_CACHE_PROGRESS_BAR, L"CacheProgressbar" }, + { WIXSTDBA_CONTROL_CACHE_PROGRESS_TEXT, L"CacheProgressText" }, + { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, L"ExecuteProgressPackageText" }, + { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_BAR, L"ExecuteProgressbar" }, + { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_TEXT, L"ExecuteProgressText" }, + { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, L"ExecuteProgressActionDataText"}, + { WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, L"OverallProgressPackageText" }, + { WIXSTDBA_CONTROL_OVERALL_PROGRESS_BAR, L"OverallProgressbar" }, + { WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, L"OverallCalculatedProgressbar" }, + { WIXSTDBA_CONTROL_OVERALL_PROGRESS_TEXT, L"OverallProgressText" }, + { WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, L"ProgressCancelButton" }, + + { WIXSTDBA_CONTROL_LAUNCH_BUTTON, L"LaunchButton" }, + { WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, L"SuccessRestartButton" }, + + { WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, L"FailureLogFileLink" }, + { WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, L"FailureMessageText" }, + { WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, L"FailureRestartButton" }, +}; + +typedef struct _WIXSTDBA_PACKAGE_INFO +{ + LPWSTR sczPackageId; + BOOL fWasAlreadyInstalled; + BOOL fPlannedToBeInstalled; + BOOL fSuccessfullyInstalled; +} WIXSTDBA_PACKAGE_INFO; + + +static HRESULT DAPI EvaluateVariableConditionCallback( + __in_z LPCWSTR wzCondition, + __out BOOL* pf, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI FormatVariableStringCallback( + __in_z LPCWSTR wzFormat, + __inout LPWSTR* psczOut, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI GetVariableNumericCallback( + __in_z LPCWSTR wzVariable, + __out LONGLONG* pllValue, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI SetVariableNumericCallback( + __in_z LPCWSTR wzVariable, + __in LONGLONG llValue, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI GetVariableStringCallback( + __in_z LPCWSTR wzVariable, + __inout LPWSTR* psczValue, + __in_opt LPVOID pvContext + ); +static HRESULT DAPI SetVariableStringCallback( + __in_z LPCWSTR wzVariable, + __in_z_opt LPCWSTR wzValue, + __in BOOL fFormatted, + __in_opt LPVOID pvContext + ); +static LPCSTR LoggingRequestStateToString( + __in BOOTSTRAPPER_REQUEST_STATE requestState + ); +static LPCSTR LoggingMsiFeatureStateToString( + __in BOOTSTRAPPER_FEATURE_STATE featureState + ); + + +class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplication +{ +public: // IBootstrapperApplication + virtual STDMETHODIMP OnStartup() + { + HRESULT hr = S_OK; + DWORD dwUIThreadId = 0; + + // create UI thread + m_hUiThread = ::CreateThread(NULL, 0, UiThreadProc, this, 0, &dwUIThreadId); + if (!m_hUiThread) + { + ExitWithLastError(hr, "Failed to create UI thread."); + } + + LExit: + return hr; + } + + + virtual STDMETHODIMP OnShutdown( + __inout BOOTSTRAPPER_SHUTDOWN_ACTION* pAction + ) + { + HRESULT hr = S_OK; + + // wait for UI thread to terminate + if (m_hUiThread) + { + ::WaitForSingleObject(m_hUiThread, INFINITE); + ReleaseHandle(m_hUiThread); + } + + // If a restart was required. + if (m_fRestartRequired) + { + if (m_fAllowRestart) + { + *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART; + } + + if (m_fPrereq) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, m_fAllowRestart ? "The prerequisites scheduled a restart. The bootstrapper application will be reloaded after the computer is restarted." + : "A restart is required by the prerequisites but the user delayed it. The bootstrapper application will be reloaded after the computer is restarted."); + } + } + else if (m_fPrereqInstalled) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were successfully installed. The bootstrapper application will be reloaded."); + *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER; + } + else if (m_fPrereqAlreadyInstalled) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop."); + } + else if (m_fPrereq) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were not successfully installed, error: 0x%x. The bootstrapper application will be not reloaded.", m_hrFinal); + } + + return hr; + } + + + virtual STDMETHODIMP OnDetectRelatedBundle( + __in LPCWSTR wzBundleId, + __in BOOTSTRAPPER_RELATION_TYPE relationType, + __in LPCWSTR wzBundleTag, + __in BOOL fPerMachine, + __in LPCWSTR wzVersion, + __in BOOTSTRAPPER_RELATED_OPERATION operation, + __in BOOL fMissingFromCache, + __inout BOOL* pfCancel + ) + { + BAL_INFO_PACKAGE* pPackage = NULL; + + if (!fMissingFromCache) + { + if (SUCCEEDED(BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine, &pPackage))) + { + InitializePackageInfoForPackage(pPackage); + } + + // If we're not doing a prerequisite install, remember when our bundle would cause a downgrade. + if (!m_fPrereq && BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE == operation) + { + m_fDowngrading = TRUE; + } + } + + return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, operation, fMissingFromCache, pfCancel); + } + + + virtual STDMETHODIMP OnDetectPackageComplete( + __in LPCWSTR wzPackageId, + __in HRESULT /*hrStatus*/, + __in BOOTSTRAPPER_PACKAGE_STATE state + ) + { + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; + BAL_INFO_PACKAGE* pPackage = NULL; + + if (BOOTSTRAPPER_PACKAGE_STATE_PRESENT == state && + SUCCEEDED(GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage)) && + pPackageInfo) + { + // If the package is already installed, remember that. + pPackageInfo->fWasAlreadyInstalled = TRUE; + } + + return S_OK; + } + + + virtual STDMETHODIMP OnDetectComplete( + __in HRESULT hrStatus, + __in BOOL /*fEligibleForCleanup*/ + ) + { + HRESULT hr = S_OK; + // If we're not interacting with the user or we're doing a layout or we're resuming just after a force restart + // then automatically start planning. + BOOL fSkipToPlan = SUCCEEDED(hrStatus) && + (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || + BOOTSTRAPPER_ACTION_LAYOUT == m_command.action || + BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType); + // If we're requiring user input (which currently means Install, Repair, or Uninstall) + // or if we're skipping to an action that modifies machine state + // then evaluate conditions. + BOOL fEvaluateConditions = SUCCEEDED(hrStatus) && + (!fSkipToPlan || BOOTSTRAPPER_ACTION_LAYOUT < m_command.action && BOOTSTRAPPER_ACTION_UPDATE_REPLACE > m_command.action); + + if (fEvaluateConditions) + { + hrStatus = EvaluateConditions(); + } + + if (FAILED(hrStatus)) + { + fSkipToPlan = FALSE; + } + else + { + if (m_fPrereq) + { + m_fPrereqAlreadyInstalled = TRUE; + + // At this point we have to assume that all prerequisite packages need to be installed, so set to false if any of them aren't installed. + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) + { + BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i]; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast(pPackage->pvCustomData); + if (pPackage->fPrereqPackage && pPackageInfo && !pPackageInfo->fWasAlreadyInstalled) + { + m_fPrereqAlreadyInstalled = FALSE; + break; + } + } + } + } + + SetState(WIXSTDBA_STATE_DETECTED, hrStatus); + + if (fSkipToPlan) + { + ::PostMessageW(m_hWnd, WM_WIXSTDBA_PLAN_PACKAGES, 0, m_command.action); + } + + return hr; + } + + + virtual STDMETHODIMP OnPlanRelatedBundle( + __in_z LPCWSTR wzBundleId, + __in BOOTSTRAPPER_REQUEST_STATE recommendedState, + __inout_z BOOTSTRAPPER_REQUEST_STATE* pRequestedState, + __inout BOOL* pfCancel + ) + { + // If we're only installing prerequisites, do not touch related bundles. + if (m_fPrereq) + { + *pRequestedState = BOOTSTRAPPER_REQUEST_STATE_NONE; + } + + return CBalBaseBootstrapperApplication::OnPlanRelatedBundle(wzBundleId, recommendedState, pRequestedState, pfCancel); + } + + + virtual STDMETHODIMP OnPlanPackageBegin( + __in_z LPCWSTR wzPackageId, + __in BOOTSTRAPPER_PACKAGE_STATE state, + __in BOOL fCached, + __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, + __in BOOTSTRAPPER_REQUEST_STATE recommendedState, + __in BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, + __inout BOOTSTRAPPER_REQUEST_STATE* pRequestState, + __inout BOOTSTRAPPER_CACHE_TYPE* pRequestedCacheType, + __inout BOOL* pfCancel + ) + { + HRESULT hr = S_OK; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; + BAL_INFO_PACKAGE* pPackage = NULL; + + // If we're planning to install prerequisites, install them. The prerequisites need to be installed + // in all cases (even uninstall!) so the BA can load next. + if (m_fPrereq) + { + // Only install prerequisite packages, and check the InstallCondition on them. + BOOL fInstall = FALSE; + hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); + if (SUCCEEDED(hr) && pPackage->fPrereqPackage && pPackageInfo) + { + pPackageInfo->fPlannedToBeInstalled = fInstall = BOOTSTRAPPER_PACKAGE_CONDITION_FALSE != installCondition; + } + + if (fInstall) + { + *pRequestState = BOOTSTRAPPER_REQUEST_STATE_PRESENT; + } + else + { + *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE; + } + + // Don't force cache packages while installing prerequisites. + if (BOOTSTRAPPER_CACHE_TYPE_FORCE == *pRequestedCacheType) + { + *pRequestedCacheType = BOOTSTRAPPER_CACHE_TYPE_KEEP; + } + } + else if (m_sczAfterForcedRestartPackage) // after force restart, skip packages until after the package that caused the restart. + { + // After restart we need to finish the dependency registration for our package so allow the package + // to go present. + if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzPackageId, -1, m_sczAfterForcedRestartPackage, -1)) + { + // Do not allow a repair because that could put us in a perpetual restart loop. + if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == *pRequestState) + { + *pRequestState = BOOTSTRAPPER_REQUEST_STATE_PRESENT; + } + + ReleaseNullStr(m_sczAfterForcedRestartPackage); // no more skipping now. + } + else // not the matching package, so skip it. + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Skipping package: %ls, after restart because it was applied before the restart.", wzPackageId); + + *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE; + } + } + + return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel); + } + + + virtual STDMETHODIMP OnPlanMsiPackage( + __in_z LPCWSTR wzPackageId, + __in BOOL fExecute, + __in BOOTSTRAPPER_ACTION_STATE action, + __inout BOOL* pfCancel, + __inout BURN_MSI_PROPERTY* pActionMsiProperty, + __inout INSTALLUILEVEL* pUiLevel, + __inout BOOL* pfDisableExternalUiHandler + ) + { + HRESULT hr = S_OK; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; + BAL_INFO_PACKAGE* pPackage = NULL; + BOOL fShowInternalUI = FALSE; + INSTALLUILEVEL uiLevel = INSTALLUILEVEL_NOCHANGE; + + switch (m_command.display) + { + case BOOTSTRAPPER_DISPLAY_FULL: + uiLevel = INSTALLUILEVEL_FULL; + break; + + case BOOTSTRAPPER_DISPLAY_PASSIVE: + uiLevel = INSTALLUILEVEL_REDUCED; + break; + } + + if (INSTALLUILEVEL_NOCHANGE != uiLevel) + { + hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); + if (SUCCEEDED(hr) && pPackage->sczDisplayInternalUICondition) + { + hr = BalEvaluateCondition(pPackage->sczDisplayInternalUICondition, &fShowInternalUI); + BalExitOnFailure(hr, "Failed to evaluate condition for package '%ls': %ls", wzPackageId, pPackage->sczDisplayInternalUICondition); + + if (fShowInternalUI) + { + *pUiLevel = uiLevel; + } + } + } + + LExit: + return __super::OnPlanMsiPackage(wzPackageId, fExecute, action, pfCancel, pActionMsiProperty, pUiLevel, pfDisableExternalUiHandler); + } + + + virtual STDMETHODIMP OnPlanComplete( + __in HRESULT hrStatus + ) + { + HRESULT hr = S_OK; + + if (m_fPrereq) + { + m_fPrereqAlreadyInstalled = TRUE; + + // Now that we've planned the packages, we can focus on the prerequisite packages that are supposed to be installed. + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) + { + BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i]; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast(pPackage->pvCustomData); + if (pPackage->fPrereqPackage && pPackageInfo && !pPackageInfo->fWasAlreadyInstalled && pPackageInfo->fPlannedToBeInstalled) + { + m_fPrereqAlreadyInstalled = FALSE; + break; + } + } + } + + SetState(WIXSTDBA_STATE_PLANNED, hrStatus); + + if (SUCCEEDED(hrStatus)) + { + ::PostMessageW(m_hWnd, WM_WIXSTDBA_APPLY_PACKAGES, 0, 0); + } + + m_fStartedExecution = FALSE; + m_dwCalculatedCacheProgress = 0; + m_dwCalculatedExecuteProgress = 0; + + return hr; + } + + + virtual STDMETHODIMP OnPauseAutomaticUpdatesBegin( + ) + { + HRESULT hr = S_OK; + LOC_STRING* pLocString = NULL; + LPWSTR sczFormattedString = NULL; + LPCWSTR wz = NULL; + + hr = __super::OnPauseAutomaticUpdatesBegin(); + + LocGetString(m_pWixLoc, L"#(loc.PauseAutomaticUpdatesMessage)", &pLocString); + + if (pLocString) + { + BalFormatString(pLocString->wzText, &sczFormattedString); + } + + wz = sczFormattedString ? sczFormattedString : L"Pausing Windows automatic updates"; + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); + + ReleaseStr(sczFormattedString); + return hr; + } + + + virtual STDMETHODIMP OnSystemRestorePointBegin( + ) + { + HRESULT hr = S_OK; + LOC_STRING* pLocString = NULL; + LPWSTR sczFormattedString = NULL; + LPCWSTR wz = NULL; + + hr = __super::OnSystemRestorePointBegin(); + + LocGetString(m_pWixLoc, L"#(loc.SystemRestorePointMessage)", &pLocString); + + if (pLocString) + { + BalFormatString(pLocString->wzText, &sczFormattedString); + } + + wz = sczFormattedString ? sczFormattedString : L"Creating system restore point"; + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); + + ReleaseStr(sczFormattedString); + return hr; + } + + + virtual STDMETHODIMP OnCachePackageBegin( + __in_z LPCWSTR wzPackageId, + __in DWORD cCachePayloads, + __in DWORD64 dw64PackageCacheSize, + __inout BOOL* pfCancel + ) + { + if (wzPackageId && *wzPackageId) + { + BAL_INFO_PACKAGE* pPackage = NULL; + HRESULT hr = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); + LPCWSTR wz = (SUCCEEDED(hr) && pPackage->sczDisplayName) ? pPackage->sczDisplayName : wzPackageId; + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, wz); + + // If something started executing, leave it in the overall progress text. + if (!m_fStartedExecution) + { + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); + } + } + + return __super::OnCachePackageBegin(wzPackageId, cCachePayloads, dw64PackageCacheSize, pfCancel); + } + + + virtual STDMETHODIMP OnCacheAcquireProgress( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in DWORD64 dw64Progress, + __in DWORD64 dw64Total, + __in DWORD dwOverallPercentage, + __inout BOOL* pfCancel + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCacheAcquireProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage); +#endif + + UpdateCacheProgress(dwOverallPercentage); + + return __super::OnCacheAcquireProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnCacheContainerOrPayloadVerifyProgress( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in DWORD64 dw64Progress, + __in DWORD64 dw64Total, + __in DWORD dwOverallPercentage, + __inout BOOL* pfCancel + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCacheContainerOrPayloadVerifyProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage); +#endif + + UpdateCacheProgress(dwOverallPercentage); + + return __super::OnCacheContainerOrPayloadVerifyProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnCachePayloadExtractProgress( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in DWORD64 dw64Progress, + __in DWORD64 dw64Total, + __in DWORD dwOverallPercentage, + __inout BOOL* pfCancel + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCachePayloadExtractProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage); +#endif + + UpdateCacheProgress(dwOverallPercentage); + + return __super::OnCachePayloadExtractProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnCacheVerifyProgress( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in DWORD64 dw64Progress, + __in DWORD64 dw64Total, + __in DWORD dwOverallPercentage, + __in BOOTSTRAPPER_CACHE_VERIFY_STEP verifyStep, + __inout BOOL* pfCancel + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCacheVerifyProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%, step: %u", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, verifyStep); +#endif + + UpdateCacheProgress(dwOverallPercentage); + + return __super::OnCacheVerifyProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, verifyStep, pfCancel); + } + + + virtual STDMETHODIMP OnCacheAcquireComplete( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in HRESULT hrStatus, + __in BOOTSTRAPPER_CACHEACQUIRECOMPLETE_ACTION recommendation, + __inout BOOTSTRAPPER_CACHEACQUIRECOMPLETE_ACTION* pAction + ) + { + SetProgressState(hrStatus); + return __super::OnCacheAcquireComplete(wzPackageOrContainerId, wzPayloadId, hrStatus, recommendation, pAction); + } + + + virtual STDMETHODIMP OnCacheContainerOrPayloadVerifyComplete( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in HRESULT hrStatus + ) + { + SetProgressState(hrStatus); + return __super::OnCacheContainerOrPayloadVerifyComplete(wzPackageOrContainerId, wzPayloadId, hrStatus); + } + + + virtual STDMETHODIMP OnCachePayloadExtractComplete( + __in_z LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in HRESULT hrStatus + ) + { + SetProgressState(hrStatus); + return __super::OnCachePayloadExtractComplete(wzPackageOrContainerId, wzPayloadId, hrStatus); + } + + + virtual STDMETHODIMP OnCacheVerifyComplete( + __in_z LPCWSTR wzPackageId, + __in_z LPCWSTR wzPayloadId, + __in HRESULT hrStatus, + __in BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION recommendation, + __inout BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION* pAction + ) + { + SetProgressState(hrStatus); + return __super::OnCacheVerifyComplete(wzPackageId, wzPayloadId, hrStatus, recommendation, pAction); + } + + + virtual STDMETHODIMP OnCacheComplete( + __in HRESULT hrStatus + ) + { + UpdateCacheProgress(SUCCEEDED(hrStatus) ? 100 : 0); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, L""); + SetState(WIXSTDBA_STATE_CACHED, S_OK); // we always return success here and let OnApplyComplete() deal with the error. + return __super::OnCacheComplete(hrStatus); + } + + + virtual STDMETHODIMP OnError( + __in BOOTSTRAPPER_ERROR_TYPE errorType, + __in LPCWSTR wzPackageId, + __in DWORD dwCode, + __in_z LPCWSTR wzError, + __in DWORD dwUIHint, + __in DWORD /*cData*/, + __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/, + __in int /*nRecommendation*/, + __inout int* pResult + ) + { + HRESULT hr = S_OK; + int nResult = *pResult; + LPWSTR sczError = NULL; + + if (BOOTSTRAPPER_DISPLAY_EMBEDDED == m_command.display) + { + hr = m_pEngine->SendEmbeddedError(dwCode, wzError, dwUIHint, &nResult); + if (FAILED(hr)) + { + nResult = IDERROR; + } + } + else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display) + { + // If this is an authentication failure, let the engine try to handle it for us. + if (BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_SERVER == errorType || BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_PROXY == errorType) + { + nResult = IDTRYAGAIN; + } + else // show a generic error message box. + { + BalRetryErrorOccurred(wzPackageId, dwCode); + + if (!m_fShowingInternalUiThisPackage) + { + // If no error message was provided, use the error code to try and get an error message. + if (!wzError || !*wzError || BOOTSTRAPPER_ERROR_TYPE_WINDOWS_INSTALLER != errorType) + { + hr = StrAllocFromError(&sczError, dwCode, NULL); + if (FAILED(hr) || !sczError || !*sczError) + { + // special case for ERROR_FAIL_NOACTION_REBOOT: use loc string for Windows XP + if (ERROR_FAIL_NOACTION_REBOOT == dwCode) + { + LOC_STRING* pLocString = NULL; + hr = LocGetString(m_pWixLoc, L"#(loc.ErrorFailNoActionReboot)", &pLocString); + if (SUCCEEDED(hr)) + { + StrAllocString(&sczError, pLocString->wzText, 0); + } + else + { + StrAllocFormatted(&sczError, L"0x%x", dwCode); + } + } + else + { + StrAllocFormatted(&sczError, L"0x%x", dwCode); + } + } + hr = S_OK; + } + + nResult = ::MessageBoxW(m_hWnd, sczError ? sczError : wzError, m_pTheme->sczCaption, dwUIHint); + } + } + + SetProgressState(HRESULT_FROM_WIN32(dwCode)); + } + else // just take note of the error code and let things continue. + { + BalRetryErrorOccurred(wzPackageId, dwCode); + } + + ReleaseStr(sczError); + *pResult = nResult; + return hr; + } + + + virtual STDMETHODIMP OnExecuteMsiMessage( + __in_z LPCWSTR wzPackageId, + __in INSTALLMESSAGE messageType, + __in DWORD dwUIHint, + __in_z LPCWSTR wzMessage, + __in DWORD cData, + __in_ecount_z_opt(cData) LPCWSTR* rgwzData, + __in int nRecommendation, + __inout int* pResult + ) + { +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnExecuteMsiMessage() - package: %ls, message: %ls", wzPackageId, wzMessage); +#endif + if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display && (INSTALLMESSAGE_WARNING == messageType || INSTALLMESSAGE_USER == messageType)) + { + if (!m_fShowingInternalUiThisPackage) + { + int nResult = ::MessageBoxW(m_hWnd, wzMessage, m_pTheme->sczCaption, dwUIHint); + return nResult; + } + } + + if (INSTALLMESSAGE_ACTIONSTART == messageType) + { + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, wzMessage); + } + + return __super::OnExecuteMsiMessage(wzPackageId, messageType, dwUIHint, wzMessage, cData, rgwzData, nRecommendation, pResult); + } + + + virtual STDMETHODIMP OnProgress( + __in DWORD dwProgressPercentage, + __in DWORD dwOverallProgressPercentage, + __inout BOOL* pfCancel + ) + { + WCHAR wzProgress[5] = { }; + +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnProgress() - progress: %u%%, overall progress: %u%%", dwProgressPercentage, dwOverallProgressPercentage); +#endif + + ::StringCchPrintfW(wzProgress, countof(wzProgress), L"%u%%", dwOverallProgressPercentage); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_TEXT, wzProgress); + + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_BAR, dwOverallProgressPercentage); + SetTaskbarButtonProgress(dwOverallProgressPercentage); + + return __super::OnProgress(dwProgressPercentage, dwOverallProgressPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnExecutePackageBegin( + __in_z LPCWSTR wzPackageId, + __in BOOL fExecute, + __in BOOTSTRAPPER_ACTION_STATE action, + __in INSTALLUILEVEL uiLevel, + __in BOOL fDisableExternalUiHandler, + __inout BOOL* pfCancel + ) + { + HRESULT hr = S_OK; + LPWSTR sczFormattedString = NULL; + BOOL fShowingInternalUiThisPackage = FALSE; + + m_fStartedExecution = TRUE; + + if (wzPackageId && *wzPackageId) + { + BAL_INFO_PACKAGE* pPackage = NULL; + BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); + + LPCWSTR wz = wzPackageId; + if (pPackage) + { + LOC_STRING* pLocString = NULL; + + switch (pPackage->type) + { + case BAL_INFO_PACKAGE_TYPE_BUNDLE_ADDON: + LocGetString(m_pWixLoc, L"#(loc.ExecuteAddonRelatedBundleMessage)", &pLocString); + break; + + case BAL_INFO_PACKAGE_TYPE_BUNDLE_PATCH: + LocGetString(m_pWixLoc, L"#(loc.ExecutePatchRelatedBundleMessage)", &pLocString); + break; + + case BAL_INFO_PACKAGE_TYPE_BUNDLE_UPGRADE: + LocGetString(m_pWixLoc, L"#(loc.ExecuteUpgradeRelatedBundleMessage)", &pLocString); + break; + } + + if (pLocString) + { + // If the wix developer is showing a hidden variable in the UI, then obviously they don't care about keeping it safe + // so don't go down the rabbit hole of making sure that this is securely freed. + BalFormatString(pLocString->wzText, &sczFormattedString); + } + + wz = sczFormattedString ? sczFormattedString : pPackage->sczDisplayName ? pPackage->sczDisplayName : wzPackageId; + } + + fShowingInternalUiThisPackage = INSTALLUILEVEL_NONE != (INSTALLUILEVEL_NONE & uiLevel); + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); + } + + ::EnterCriticalSection(&m_csShowingInternalUiThisPackage); + m_fShowingInternalUiThisPackage = fShowingInternalUiThisPackage; + hr = __super::OnExecutePackageBegin(wzPackageId, fExecute, action, uiLevel, fDisableExternalUiHandler, pfCancel); + ::LeaveCriticalSection(&m_csShowingInternalUiThisPackage); + + ReleaseStr(sczFormattedString); + return hr; + } + + + virtual STDMETHODIMP OnExecuteProgress( + __in_z LPCWSTR wzPackageId, + __in DWORD dwProgressPercentage, + __in DWORD dwOverallProgressPercentage, + __inout BOOL* pfCancel + ) + { + WCHAR wzProgress[5] = { }; + +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnExecuteProgress() - package: %ls, progress: %u%%, overall progress: %u%%", wzPackageId, dwProgressPercentage, dwOverallProgressPercentage); +#endif + + ::StringCchPrintfW(wzProgress, countof(wzProgress), L"%u%%", dwOverallProgressPercentage); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_TEXT, wzProgress); + + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_BAR, dwOverallProgressPercentage); + + m_dwCalculatedExecuteProgress = dwOverallProgressPercentage * (100 - WIXSTDBA_ACQUIRE_PERCENTAGE) / 100; + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); + + SetTaskbarButtonProgress(m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); + + return __super::OnExecuteProgress(wzPackageId, dwProgressPercentage, dwOverallProgressPercentage, pfCancel); + } + + + virtual STDMETHODIMP OnExecutePackageComplete( + __in_z LPCWSTR wzPackageId, + __in HRESULT hrStatus, + __in BOOTSTRAPPER_APPLY_RESTART restart, + __in BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION recommendation, + __inout BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION* pAction + ) + { + HRESULT hr = S_OK; + SetProgressState(hrStatus); + + hr = __super::OnExecutePackageComplete(wzPackageId, hrStatus, restart, recommendation, pAction); + + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; + BAL_INFO_PACKAGE* pPackage; + HRESULT hrPrereq = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); + if (SUCCEEDED(hrPrereq) && pPackageInfo) + { + pPackageInfo->fSuccessfullyInstalled = SUCCEEDED(hrStatus); + + // If the prerequisite required a restart (any restart) then do an immediate + // restart to ensure that the bundle will get launched again post reboot. + if (m_fPrereq && pPackage->fPrereqPackage && BOOTSTRAPPER_APPLY_RESTART_NONE != restart) + { + *pAction = BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION_RESTART; + } + } + + return hr; + } + + + virtual STDMETHODIMP OnExecuteComplete( + __in HRESULT hrStatus + ) + { + HRESULT hr = S_OK; + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, L""); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, L""); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, L""); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, FALSE); // no more cancel. + m_fShowingInternalUiThisPackage = FALSE; + + SetState(WIXSTDBA_STATE_EXECUTED, S_OK); // we always return success here and let OnApplyComplete() deal with the error. + SetProgressState(hrStatus); + + return hr; + } + + + virtual STDMETHODIMP OnCacheAcquireResolving( + __in_z_opt LPCWSTR wzPackageOrContainerId, + __in_z_opt LPCWSTR wzPayloadId, + __in_z LPCWSTR* rgSearchPaths, + __in DWORD /*cSearchPaths*/, + __in BOOL /*fFoundLocal*/, + __in DWORD dwRecommendedSearchPath, + __in_z_opt LPCWSTR /*wzDownloadUrl*/, + __in_z_opt LPCWSTR /*wzPayloadContainerId*/, + __in BOOTSTRAPPER_CACHE_RESOLVE_OPERATION /*recommendation*/, + __inout DWORD* /*pdwChosenSearchPath*/, + __inout BOOTSTRAPPER_CACHE_RESOLVE_OPERATION* pAction, + __inout BOOL* pfCancel + ) + { + HRESULT hr = S_OK; + + if (BOOTSTRAPPER_CACHE_RESOLVE_NONE == *pAction && BOOTSTRAPPER_DISPLAY_FULL == m_command.display) // prompt to change the source location. + { + OPENFILENAMEW ofn = { }; + WCHAR wzFile[MAX_PATH] = { }; + + ::StringCchCopyW(wzFile, countof(wzFile), rgSearchPaths[dwRecommendedSearchPath]); + + ofn.lStructSize = sizeof(ofn); + ofn.hwndOwner = m_hWnd; + ofn.lpstrFile = wzFile; + ofn.nMaxFile = countof(wzFile); + ofn.lpstrFilter = L"All Files\0*.*\0"; + ofn.nFilterIndex = 1; + ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; + ofn.lpstrTitle = m_pTheme->sczCaption; + + if (::GetOpenFileNameW(&ofn)) + { + hr = m_pEngine->SetLocalSource(wzPackageOrContainerId, wzPayloadId, ofn.lpstrFile); + *pAction = BOOTSTRAPPER_CACHE_RESOLVE_RETRY; + } + else + { + *pfCancel = TRUE; + } + } + // else there's nothing more we can do in non-interactive mode + + *pfCancel |= CheckCanceled(); + return hr; + } + + + virtual STDMETHODIMP OnApplyComplete( + __in HRESULT hrStatus, + __in BOOTSTRAPPER_APPLY_RESTART restart, + __in BOOTSTRAPPER_APPLYCOMPLETE_ACTION recommendation, + __inout BOOTSTRAPPER_APPLYCOMPLETE_ACTION* pAction + ) + { + HRESULT hr = S_OK; + + __super::OnApplyComplete(hrStatus, restart, recommendation, pAction); + + m_restartResult = restart; // remember the restart result so we return the correct error code no matter what the user chooses to do in the UI. + + // If a restart was encountered and we are not suppressing restarts, then restart is required. + m_fRestartRequired = (BOOTSTRAPPER_APPLY_RESTART_NONE != restart && BOOTSTRAPPER_RESTART_NEVER < m_command.restart); + BalSetStringVariable(WIXSTDBA_VARIABLE_RESTART_REQUIRED, m_fRestartRequired ? L"1" : NULL, FALSE); + + // If a restart is required and we're not displaying a UI or we are not supposed to prompt for restart then allow the restart. + m_fAllowRestart = m_fRestartRequired && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_RESTART_PROMPT < m_command.restart); + + if (m_fPrereq) + { + m_fPrereqInstalled = TRUE; + BOOL fInstalledAPackage = FALSE; + + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) + { + BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i]; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast(pPackage->pvCustomData); + if (pPackage->fPrereqPackage && pPackageInfo && pPackageInfo->fPlannedToBeInstalled && !pPackageInfo->fWasAlreadyInstalled) + { + if (pPackageInfo->fSuccessfullyInstalled) + { + fInstalledAPackage = TRUE; + } + else + { + m_fPrereqInstalled = FALSE; + break; + } + } + } + + m_fPrereqInstalled = m_fPrereqInstalled && fInstalledAPackage; + } + + // If we are showing UI, wait a beat before moving to the final screen. + if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) + { + ::Sleep(250); + } + + SetState(WIXSTDBA_STATE_APPLIED, hrStatus); + SetTaskbarButtonProgress(100); // show full progress bar, green, yellow, or red + + *pAction = BOOTSTRAPPER_APPLYCOMPLETE_ACTION_NONE; + + return hr; + } + + virtual STDMETHODIMP OnLaunchApprovedExeComplete( + __in HRESULT hrStatus, + __in DWORD /*processId*/ + ) + { + HRESULT hr = S_OK; + + if (HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) == hrStatus) + { + //try with ShelExec next time + OnClickLaunchButton(); + } + else + { + ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); + } + + return hr; + } + + virtual STDMETHODIMP_(void) BAProcFallback( + __in BOOTSTRAPPER_APPLICATION_MESSAGE message, + __in const LPVOID pvArgs, + __inout LPVOID pvResults, + __inout HRESULT* phr, + __in_opt LPVOID /*pvContext*/ + ) + { + if (!m_pfnBAFunctionsProc || FAILED(*phr)) + { + return; + } + + // Always log before and after so we don't get blamed when BAFunctions changes something. + switch (message) + { + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTBEGIN: + OnDetectBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPLETE: + OnDetectCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANBEGIN: + OnPlanBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPLETE: + OnPlanCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP: // BAFunctions is loaded during this event on a separate thread so it's not possible to forward it. + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN: + OnShutdownFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMSHUTDOWN: + OnSystemShutdownFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE: + OnDetectForwardCompatibleBundleFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATEBEGIN: + OnDetectUpdateBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATE: + OnDetectUpdateFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATECOMPLETE: + OnDetectUpdateCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE: + OnDetectRelatedBundleFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN: + OnDetectPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE: + OnDetectRelatedMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET: + OnDetectPatchTargetFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE: + OnDetectMsiFeatureFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE: + OnDetectPackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE: + OnPlanRelatedBundleFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN: + OnPlanPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET: + OnPlanPatchTargetFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE: + OnPlanMsiFeatureFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGECOMPLETE: + OnPlanPackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYBEGIN: + OnApplyBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONELEVATEBEGIN: + OnElevateBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONELEVATECOMPLETE: + OnElevateCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPROGRESS: + OnProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONERROR: + OnErrorFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONREGISTERBEGIN: + OnRegisterBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONREGISTERCOMPLETE: + OnRegisterCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEBEGIN: + OnCacheBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGEBEGIN: + OnCachePackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIREBEGIN: + OnCacheAcquireBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIREPROGRESS: + OnCacheAcquireProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIRERESOLVING: + OnCacheAcquireResolvingFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIRECOMPLETE: + OnCacheAcquireCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEVERIFYBEGIN: + OnCacheVerifyBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEVERIFYCOMPLETE: + OnCacheVerifyCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGECOMPLETE: + OnCachePackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECOMPLETE: + OnCacheCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEBEGIN: + OnExecuteBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPACKAGEBEGIN: + OnExecutePackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPATCHTARGET: + OnExecutePatchTargetFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPROGRESS: + OnExecuteProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEMSIMESSAGE: + OnExecuteMsiMessageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEFILESINUSE: + OnExecuteFilesInUseFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPACKAGECOMPLETE: + OnExecutePackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTECOMPLETE: + OnExecuteCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONUNREGISTERBEGIN: + OnUnregisterBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONUNREGISTERCOMPLETE: + OnUnregisterCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYCOMPLETE: + OnApplyCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONLAUNCHAPPROVEDEXEBEGIN: + OnLaunchApprovedExeBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONLAUNCHAPPROVEDEXECOMPLETE: + OnLaunchApprovedExeCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIPACKAGE: + OnPlanMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONBEGINMSITRANSACTIONBEGIN: + OnBeginMsiTransactionBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONBEGINMSITRANSACTIONCOMPLETE: + OnBeginMsiTransactionCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCOMMITMSITRANSACTIONBEGIN: + OnCommitMsiTransactionBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCOMMITMSITRANSACTIONCOMPLETE: + OnCommitMsiTransactionCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONROLLBACKMSITRANSACTIONBEGIN: + OnRollbackMsiTransactionBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONROLLBACKMSITRANSACTIONCOMPLETE: + OnRollbackMsiTransactionCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPAUSEAUTOMATICUPDATESBEGIN: + OnPauseAutomaticUpdatesBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPAUSEAUTOMATICUPDATESCOMPLETE: + OnPauseAutomaticUpdatesCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN: + OnSystemRestorePointBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE: + OnSystemRestorePointCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDPACKAGE: + OnPlannedPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEVERIFYPROGRESS: + OnCacheVerifyProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYBEGIN: + OnCacheContainerOrPayloadVerifyBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE: + OnCacheContainerOrPayloadVerifyCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS: + OnCacheContainerOrPayloadVerifyProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTBEGIN: + OnCachePayloadExtractBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTCOMPLETE: + OnCachePayloadExtractCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTPROGRESS: + OnCachePayloadExtractProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); + break; + default: +#ifdef DEBUG + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message); +#endif + m_pfnBAFunctionsProc((BA_FUNCTIONS_MESSAGE)message, pvArgs, pvResults, m_pvBAFunctionsProcContext); + break; + } + } + + +private: // privates + void OnDetectBeginFallback( + __in BA_ONDETECTBEGIN_ARGS* pArgs, + __inout BA_ONDETECTBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectCompleteFallback( + __in BA_ONDETECTCOMPLETE_ARGS* pArgs, + __inout BA_ONDETECTCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlanBeginFallback( + __in BA_ONPLANBEGIN_ARGS* pArgs, + __inout BA_ONPLANBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlanCompleteFallback( + __in BA_ONPLANCOMPLETE_ARGS* pArgs, + __inout BA_ONPLANCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnShutdownFallback( + __in BA_ONSHUTDOWN_ARGS* pArgs, + __inout BA_ONSHUTDOWN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnSystemShutdownFallback( + __in BA_ONSYSTEMSHUTDOWN_ARGS* pArgs, + __inout BA_ONSYSTEMSHUTDOWN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectForwardCompatibleBundleFallback( + __in BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs, + __inout BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectUpdateBeginFallback( + __in BA_ONDETECTUPDATEBEGIN_ARGS* pArgs, + __inout BA_ONDETECTUPDATEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTUPDATEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectUpdateFallback( + __in BA_ONDETECTUPDATE_ARGS* pArgs, + __inout BA_ONDETECTUPDATE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTUPDATE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectUpdateCompleteFallback( + __in BA_ONDETECTUPDATECOMPLETE_ARGS* pArgs, + __inout BA_ONDETECTUPDATECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTUPDATECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectRelatedBundleFallback( + __in BA_ONDETECTRELATEDBUNDLE_ARGS* pArgs, + __inout BA_ONDETECTRELATEDBUNDLE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectPackageBeginFallback( + __in BA_ONDETECTPACKAGEBEGIN_ARGS* pArgs, + __inout BA_ONDETECTPACKAGEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectRelatedMsiPackageFallback( + __in BA_ONDETECTRELATEDMSIPACKAGE_ARGS* pArgs, + __inout BA_ONDETECTRELATEDMSIPACKAGE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectPatchTargetFallback( + __in BA_ONDETECTPATCHTARGET_ARGS* pArgs, + __inout BA_ONDETECTPATCHTARGET_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectMsiFeatureFallback( + __in BA_ONDETECTMSIFEATURE_ARGS* pArgs, + __inout BA_ONDETECTMSIFEATURE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTMSIFEATURE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnDetectPackageCompleteFallback( + __in BA_ONDETECTPACKAGECOMPLETE_ARGS* pArgs, + __inout BA_ONDETECTPACKAGECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlanRelatedBundleFallback( + __in BA_ONPLANRELATEDBUNDLE_ARGS* pArgs, + __inout BA_ONPLANRELATEDBUNDLE_RESULTS* pResults + ) + { + BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE, m_hModule, pArgs->wzBundleId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); + } + + void OnPlanPackageBeginFallback( + __in BA_ONPLANPACKAGEBEGIN_ARGS* pArgs, + __inout BA_ONPLANPACKAGEBEGIN_RESULTS* pResults + ) + { + BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_PACKAGE, m_hModule, pArgs->wzPackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); + } + + void OnPlanPatchTargetFallback( + __in BA_ONPLANPATCHTARGET_ARGS* pArgs, + __inout BA_ONPLANPATCHTARGET_RESULTS* pResults + ) + { + BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, pArgs->wzProductCode, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); + } + + void OnPlanMsiFeatureFallback( + __in BA_ONPLANMSIFEATURE_ARGS* pArgs, + __inout BA_ONPLANMSIFEATURE_RESULTS* pResults + ) + { + BOOTSTRAPPER_FEATURE_STATE requestedState = pResults->requestedState; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANMSIFEATURE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_MSI_FEATURE, m_hModule, pArgs->wzPackageId, pArgs->wzFeatureId, LoggingMsiFeatureStateToString(requestedState), LoggingMsiFeatureStateToString(pResults->requestedState)); + } + + void OnPlanPackageCompleteFallback( + __in BA_ONPLANPACKAGECOMPLETE_ARGS* pArgs, + __inout BA_ONPLANPACKAGECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlannedPackageFallback( + __in BA_ONPLANNEDPACKAGE_ARGS* pArgs, + __inout BA_ONPLANNEDPACKAGE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANNEDPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnApplyBeginFallback( + __in BA_ONAPPLYBEGIN_ARGS* pArgs, + __inout BA_ONAPPLYBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONAPPLYBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnElevateBeginFallback( + __in BA_ONELEVATEBEGIN_ARGS* pArgs, + __inout BA_ONELEVATEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONELEVATEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnElevateCompleteFallback( + __in BA_ONELEVATECOMPLETE_ARGS* pArgs, + __inout BA_ONELEVATECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONELEVATECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnProgressFallback( + __in BA_ONPROGRESS_ARGS* pArgs, + __inout BA_ONPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnErrorFallback( + __in BA_ONERROR_ARGS* pArgs, + __inout BA_ONERROR_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONERROR, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnRegisterBeginFallback( + __in BA_ONREGISTERBEGIN_ARGS* pArgs, + __inout BA_ONREGISTERBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONREGISTERBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnRegisterCompleteFallback( + __in BA_ONREGISTERCOMPLETE_ARGS* pArgs, + __inout BA_ONREGISTERCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONREGISTERCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheBeginFallback( + __in BA_ONCACHEBEGIN_ARGS* pArgs, + __inout BA_ONCACHEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePackageBeginFallback( + __in BA_ONCACHEPACKAGEBEGIN_ARGS* pArgs, + __inout BA_ONCACHEPACKAGEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheAcquireBeginFallback( + __in BA_ONCACHEACQUIREBEGIN_ARGS* pArgs, + __inout BA_ONCACHEACQUIREBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIREBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheAcquireProgressFallback( + __in BA_ONCACHEACQUIREPROGRESS_ARGS* pArgs, + __inout BA_ONCACHEACQUIREPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIREPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheAcquireResolvingFallback( + __in BA_ONCACHEACQUIRERESOLVING_ARGS* pArgs, + __inout BA_ONCACHEACQUIRERESOLVING_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIRERESOLVING, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheAcquireCompleteFallback( + __in BA_ONCACHEACQUIRECOMPLETE_ARGS* pArgs, + __inout BA_ONCACHEACQUIRECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIRECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheVerifyBeginFallback( + __in BA_ONCACHEVERIFYBEGIN_ARGS* pArgs, + __inout BA_ONCACHEVERIFYBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEVERIFYBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheVerifyCompleteFallback( + __in BA_ONCACHEVERIFYCOMPLETE_ARGS* pArgs, + __inout BA_ONCACHEVERIFYCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEVERIFYCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePackageCompleteFallback( + __in BA_ONCACHEPACKAGECOMPLETE_ARGS* pArgs, + __inout BA_ONCACHEPACKAGECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheCompleteFallback( + __in BA_ONCACHECOMPLETE_ARGS* pArgs, + __inout BA_ONCACHECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteBeginFallback( + __in BA_ONEXECUTEBEGIN_ARGS* pArgs, + __inout BA_ONEXECUTEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecutePackageBeginFallback( + __in BA_ONEXECUTEPACKAGEBEGIN_ARGS* pArgs, + __inout BA_ONEXECUTEPACKAGEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecutePatchTargetFallback( + __in BA_ONEXECUTEPATCHTARGET_ARGS* pArgs, + __inout BA_ONEXECUTEPATCHTARGET_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteProgressFallback( + __in BA_ONEXECUTEPROGRESS_ARGS* pArgs, + __inout BA_ONEXECUTEPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteMsiMessageFallback( + __in BA_ONEXECUTEMSIMESSAGE_ARGS* pArgs, + __inout BA_ONEXECUTEMSIMESSAGE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEMSIMESSAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteFilesInUseFallback( + __in BA_ONEXECUTEFILESINUSE_ARGS* pArgs, + __inout BA_ONEXECUTEFILESINUSE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEFILESINUSE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecutePackageCompleteFallback( + __in BA_ONEXECUTEPACKAGECOMPLETE_ARGS* pArgs, + __inout BA_ONEXECUTEPACKAGECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnExecuteCompleteFallback( + __in BA_ONEXECUTECOMPLETE_ARGS* pArgs, + __inout BA_ONEXECUTECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnUnregisterBeginFallback( + __in BA_ONUNREGISTERBEGIN_ARGS* pArgs, + __inout BA_ONUNREGISTERBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONUNREGISTERBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnUnregisterCompleteFallback( + __in BA_ONUNREGISTERCOMPLETE_ARGS* pArgs, + __inout BA_ONUNREGISTERCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONUNREGISTERCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnApplyCompleteFallback( + __in BA_ONAPPLYCOMPLETE_ARGS* pArgs, + __inout BA_ONAPPLYCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONAPPLYCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnLaunchApprovedExeBeginFallback( + __in BA_ONLAUNCHAPPROVEDEXEBEGIN_ARGS* pArgs, + __inout BA_ONLAUNCHAPPROVEDEXEBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONLAUNCHAPPROVEDEXEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnLaunchApprovedExeCompleteFallback( + __in BA_ONLAUNCHAPPROVEDEXECOMPLETE_ARGS* pArgs, + __inout BA_ONLAUNCHAPPROVEDEXECOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONLAUNCHAPPROVEDEXECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlanMsiPackageFallback( + __in BA_ONPLANMSIPACKAGE_ARGS* pArgs, + __inout BA_ONPLANMSIPACKAGE_RESULTS* pResults + ) + { + BURN_MSI_PROPERTY actionMsiProperty = pResults->actionMsiProperty; + INSTALLUILEVEL uiLevel = pResults->uiLevel; + BOOL fDisableExternalUiHandler = pResults->fDisableExternalUiHandler; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, actionMsiProperty, uiLevel, fDisableExternalUiHandler ? "yes" : "no", pResults->actionMsiProperty, pResults->uiLevel, pResults->fDisableExternalUiHandler ? "yes" : "no"); + } + + void OnBeginMsiTransactionBeginFallback( + __in BA_ONBEGINMSITRANSACTIONBEGIN_ARGS* pArgs, + __inout BA_ONBEGINMSITRANSACTIONBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONBEGINMSITRANSACTIONBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnBeginMsiTransactionCompleteFallback( + __in BA_ONBEGINMSITRANSACTIONCOMPLETE_ARGS* pArgs, + __inout BA_ONBEGINMSITRANSACTIONCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONBEGINMSITRANSACTIONCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCommitMsiTransactionBeginFallback( + __in BA_ONCOMMITMSITRANSACTIONBEGIN_ARGS* pArgs, + __inout BA_ONCOMMITMSITRANSACTIONBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCOMMITMSITRANSACTIONBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCommitMsiTransactionCompleteFallback( + __in BA_ONCOMMITMSITRANSACTIONCOMPLETE_ARGS* pArgs, + __inout BA_ONCOMMITMSITRANSACTIONCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCOMMITMSITRANSACTIONCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnRollbackMsiTransactionBeginFallback( + __in BA_ONROLLBACKMSITRANSACTIONBEGIN_ARGS* pArgs, + __inout BA_ONROLLBACKMSITRANSACTIONBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONROLLBACKMSITRANSACTIONBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnRollbackMsiTransactionCompleteFallback( + __in BA_ONROLLBACKMSITRANSACTIONCOMPLETE_ARGS* pArgs, + __inout BA_ONROLLBACKMSITRANSACTIONCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONROLLBACKMSITRANSACTIONCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPauseAutomaticUpdatesBeginFallback( + __in BA_ONPAUSEAUTOMATICUPDATESBEGIN_ARGS* pArgs, + __inout BA_ONPAUSEAUTOMATICUPDATESBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPAUSEAUTOMATICUPDATESBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPauseAutomaticUpdatesCompleteFallback( + __in BA_ONPAUSEAUTOMATICUPDATESCOMPLETE_ARGS* pArgs, + __inout BA_ONPAUSEAUTOMATICUPDATESCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPAUSEAUTOMATICUPDATESCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnSystemRestorePointBeginFallback( + __in BA_ONSYSTEMRESTOREPOINTBEGIN_ARGS* pArgs, + __inout BA_ONSYSTEMRESTOREPOINTBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnSystemRestorePointCompleteFallback( + __in BA_ONSYSTEMRESTOREPOINTCOMPLETE_ARGS* pArgs, + __inout BA_ONSYSTEMRESTOREPOINTCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnPlanForwardCompatibleBundleFallback( + __in BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs, + __inout BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults + ) + { + BOOL fIgnoreBundle = pResults->fIgnoreBundle; + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); + BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleId, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable"); + } + + void OnCacheVerifyProgressFallback( + __in BA_ONCACHEVERIFYPROGRESS_ARGS* pArgs, + __inout BA_ONCACHEVERIFYPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEVERIFYPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheContainerOrPayloadVerifyBeginFallback( + __in BA_ONCACHECONTAINERORPAYLOADVERIFYBEGIN_ARGS* pArgs, + __inout BA_ONCACHECONTAINERORPAYLOADVERIFYBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheContainerOrPayloadVerifyCompleteFallback( + __in BA_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE_ARGS* pArgs, + __inout BA_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCacheContainerOrPayloadVerifyProgressFallback( + __in BA_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS_ARGS* pArgs, + __inout BA_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePayloadExtractBeginFallback( + __in BA_ONCACHEPAYLOADEXTRACTBEGIN_ARGS* pArgs, + __inout BA_ONCACHEPAYLOADEXTRACTBEGIN_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPAYLOADEXTRACTBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePayloadExtractCompleteFallback( + __in BA_ONCACHEPAYLOADEXTRACTCOMPLETE_ARGS* pArgs, + __inout BA_ONCACHEPAYLOADEXTRACTCOMPLETE_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPAYLOADEXTRACTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + void OnCachePayloadExtractProgressFallback( + __in BA_ONCACHEPAYLOADEXTRACTPROGRESS_ARGS* pArgs, + __inout BA_ONCACHEPAYLOADEXTRACTPROGRESS_RESULTS* pResults + ) + { + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPAYLOADEXTRACTPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); + } + + // + // UiThreadProc - entrypoint for UI thread. + // + static DWORD WINAPI UiThreadProc( + __in LPVOID pvContext + ) + { + HRESULT hr = S_OK; + CWixStandardBootstrapperApplication* pThis = (CWixStandardBootstrapperApplication*)pvContext; + BOOL fComInitialized = FALSE; + BOOL fRet = FALSE; + MSG msg = { }; + + // Initialize COM and theme. + hr = ::CoInitialize(NULL); + BalExitOnFailure(hr, "Failed to initialize COM."); + fComInitialized = TRUE; + + hr = ThemeInitialize(pThis->m_hModule); + BalExitOnFailure(hr, "Failed to initialize theme manager."); + + hr = pThis->InitializeData(); + BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application."); + + // Create main window. + pThis->InitializeTaskbarButton(); + hr = pThis->CreateMainWindow(); + BalExitOnFailure(hr, "Failed to create main window."); + + if (FAILED(pThis->m_hrFinal)) + { + pThis->SetState(WIXSTDBA_STATE_FAILED, hr); + ::PostMessageW(pThis->m_hWnd, WM_WIXSTDBA_SHOW_FAILURE, 0, 0); + } + else + { + // Okay, we're ready for packages now. + pThis->SetState(WIXSTDBA_STATE_INITIALIZED, hr); + ::PostMessageW(pThis->m_hWnd, BOOTSTRAPPER_ACTION_HELP == pThis->m_command.action ? WM_WIXSTDBA_SHOW_HELP : WM_WIXSTDBA_DETECT_PACKAGES, 0, 0); + } + + // message pump + while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0))) + { + if (-1 == fRet) + { + hr = E_UNEXPECTED; + BalExitOnFailure(hr, "Unexpected return value from message pump."); + } + else if (!ThemeHandleKeyboardMessage(pThis->m_pTheme, msg.hwnd, &msg)) + { + ::TranslateMessage(&msg); + ::DispatchMessageW(&msg); + } + } + + // Succeeded thus far, check to see if anything went wrong while actually + // executing changes. + if (FAILED(pThis->m_hrFinal)) + { + hr = pThis->m_hrFinal; + } + else if (pThis->CheckCanceled()) + { + hr = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT); + } + + LExit: + // destroy main window + pThis->DestroyMainWindow(); + pThis->UninitializeTaskbarButton(); + + // initiate engine shutdown + DWORD dwQuit = HRESULT_CODE(hr); + if (BOOTSTRAPPER_APPLY_RESTART_INITIATED == pThis->m_restartResult) + { + dwQuit = ERROR_SUCCESS_REBOOT_INITIATED; + } + else if (BOOTSTRAPPER_APPLY_RESTART_REQUIRED == pThis->m_restartResult) + { + dwQuit = ERROR_SUCCESS_REBOOT_REQUIRED; + } + pThis->m_pEngine->Quit(dwQuit); + + ReleaseTheme(pThis->m_pTheme); + ThemeUninitialize(); + + // uninitialize COM + if (fComInitialized) + { + ::CoUninitialize(); + } + + return hr; + } + + + // + // InitializeData - initializes all the package and prerequisite information. + // + HRESULT InitializeData() + { + HRESULT hr = S_OK; + LPWSTR sczModulePath = NULL; + IXMLDOMDocument *pixdManifest = NULL; + + hr = BalManifestLoad(m_hModule, &pixdManifest); + BalExitOnFailure(hr, "Failed to load bootstrapper application manifest."); + + hr = ParseOverridableVariablesFromXml(pixdManifest); + BalExitOnFailure(hr, "Failed to read overridable variables."); + + hr = ProcessCommandLine(&m_sczLanguage); + ExitOnFailure(hr, "Unknown commandline parameters."); + + hr = PathRelativeToModule(&sczModulePath, NULL, m_hModule); + BalExitOnFailure(hr, "Failed to get module path."); + + hr = LoadLocalization(sczModulePath, m_sczLanguage); + ExitOnFailure(hr, "Failed to load localization."); + + hr = LoadTheme(sczModulePath, m_sczLanguage); + ExitOnFailure(hr, "Failed to load theme."); + + hr = BalInfoParseFromXml(&m_Bundle, pixdManifest); + BalExitOnFailure(hr, "Failed to load bundle information."); + + hr = BalConditionsParseFromXml(&m_Conditions, pixdManifest, m_pWixLoc); + BalExitOnFailure(hr, "Failed to load conditions from XML."); + + hr = LoadBAFunctions(pixdManifest); + BalExitOnFailure(hr, "Failed to load bootstrapper functions."); + + GetBundleFileVersion(); + // don't fail if we couldn't get the version info; best-effort only + + hr = InitializePackageInfo(); + BalExitOnFailure(hr, "Failed to initialize wixstdba package information."); + + if (m_fPrereq) + { + hr = InitializePrerequisiteInformation(); + BalExitOnFailure(hr, "Failed to initialize prerequisite information."); + } + else + { + hr = ParseBootstrapperApplicationDataFromXml(pixdManifest); + BalExitOnFailure(hr, "Failed to read bootstrapper application data."); + } + + if (BOOTSTRAPPER_ACTION_CACHE == m_plannedAction) + { + if (m_fSupportCacheOnly) + { + // Doesn't make sense to prompt the user if cache only is requested. + if (BOOTSTRAPPER_DISPLAY_PASSIVE < m_command.display) + { + m_command.display = BOOTSTRAPPER_DISPLAY_PASSIVE; + } + + m_command.action = BOOTSTRAPPER_ACTION_CACHE; + } + else + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Ignoring attempt to only cache a bundle that does not explicitly support it."); + m_plannedAction = BOOTSTRAPPER_ACTION_UNKNOWN; + } + } + + LExit: + ReleaseObject(pixdManifest); + ReleaseStr(sczModulePath); + + return hr; + } + + + // + // ProcessCommandLine - process the provided command line arguments. + // + HRESULT ProcessCommandLine( + __inout LPWSTR* psczLanguage + ) + { + HRESULT hr = S_OK; + int argc = 0; + LPWSTR* argv = NULL; + LPWSTR sczVariableName = NULL; + LPWSTR sczVariableValue = NULL; + + if (m_command.wzCommandLine && *m_command.wzCommandLine) + { + hr = AppParseCommandLine(m_command.wzCommandLine, &argc, &argv); + ExitOnFailure(hr, "Failed to parse command line."); + + for (int i = 0; i < argc; ++i) + { + if (argv[i][0] == L'-' || argv[i][0] == L'/') + { + if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"lang", -1)) + { + if (i + 1 >= argc) + { + hr = E_INVALIDARG; + BalExitOnFailure(hr, "Must specify a language."); + } + + ++i; + + hr = StrAllocString(psczLanguage, &argv[i][0], 0); + BalExitOnFailure(hr, "Failed to copy language."); + } + } + else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"cache", -1)) + { + m_plannedAction = BOOTSTRAPPER_ACTION_CACHE; + } + else if (m_sdOverridableVariables) + { + const wchar_t* pwc = wcschr(argv[i], L'='); + if (pwc) + { + hr = StrAllocString(&sczVariableName, argv[i], pwc - argv[i]); + BalExitOnFailure(hr, "Failed to copy variable name."); + + hr = DictKeyExists(m_sdOverridableVariables, sczVariableName); + if (E_NOTFOUND == hr) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Ignoring attempt to set non-overridable variable: '%ls'.", sczVariableName); + hr = S_OK; + continue; + } + ExitOnFailure(hr, "Failed to check the dictionary of overridable variables."); + + hr = StrAllocString(&sczVariableValue, ++pwc, 0); + BalExitOnFailure(hr, "Failed to copy variable value."); + + hr = m_pEngine->SetVariableString(sczVariableName, sczVariableValue, FALSE); + BalExitOnFailure(hr, "Failed to set variable."); + } + else + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Ignoring unknown argument: %ls", argv[i]); + } + } + } + } + + LExit: + if (argv) + { + AppFreeCommandLineArgs(argv); + } + + ReleaseStr(sczVariableName); + ReleaseStr(sczVariableValue); + + return hr; + } + + HRESULT LoadLocalization( + __in_z LPCWSTR wzModulePath, + __in_z_opt LPCWSTR wzLanguage + ) + { + HRESULT hr = S_OK; + LPWSTR sczLocPath = NULL; + LPWSTR sczFormatted = NULL; + LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl"; + + // Find and load .wxl file. + hr = LocProbeForFile(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath); + BalExitOnFailure(hr, "Failed to probe for loc file: %ls in path: %ls", wzLocFileName, wzModulePath); + + hr = LocLoadFromFile(sczLocPath, &m_pWixLoc); + BalExitOnFailure(hr, "Failed to load loc file from path: %ls", sczLocPath); + + // Set WixStdBALanguageId to .wxl language id. + if (WIX_LOCALIZATION_LANGUAGE_NOT_SET != m_pWixLoc->dwLangId) + { + ::SetThreadLocale(m_pWixLoc->dwLangId); + + hr = m_pEngine->SetVariableNumeric(WIXSTDBA_VARIABLE_LANGUAGE_ID, m_pWixLoc->dwLangId); + BalExitOnFailure(hr, "Failed to set WixStdBALanguageId variable."); + } + + // Load ConfirmCancelMessage. + hr = StrAllocString(&m_sczConfirmCloseMessage, L"#(loc.ConfirmCancelMessage)", 0); + ExitOnFailure(hr, "Failed to initialize confirm message loc identifier."); + + hr = LocLocalizeString(m_pWixLoc, &m_sczConfirmCloseMessage); + BalExitOnFailure(hr, "Failed to localize confirm close message: %ls", m_sczConfirmCloseMessage); + + hr = BalFormatString(m_sczConfirmCloseMessage, &sczFormatted); + if (SUCCEEDED(hr)) + { + ReleaseStr(m_sczConfirmCloseMessage); + m_sczConfirmCloseMessage = sczFormatted; + sczFormatted = NULL; + } + + LExit: + ReleaseStr(sczFormatted); + ReleaseStr(sczLocPath); + + return hr; + } + + + HRESULT LoadTheme( + __in_z LPCWSTR wzModulePath, + __in_z_opt LPCWSTR wzLanguage + ) + { + HRESULT hr = S_OK; + LPWSTR sczThemePath = NULL; + LPCWSTR wzThemeFileName = m_fPrereq ? L"mbapreq.thm" : L"thm.xml"; + + hr = LocProbeForFile(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath); + BalExitOnFailure(hr, "Failed to probe for theme file: %ls in path: %ls", wzThemeFileName, wzModulePath); + + hr = ThemeLoadFromFile(sczThemePath, &m_pTheme); + BalExitOnFailure(hr, "Failed to load theme from path: %ls", sczThemePath); + + hr = ThemeRegisterVariableCallbacks(m_pTheme, EvaluateVariableConditionCallback, FormatVariableStringCallback, GetVariableNumericCallback, SetVariableNumericCallback, GetVariableStringCallback, SetVariableStringCallback, NULL); + BalExitOnFailure(hr, "Failed to register variable theme callbacks."); + + hr = ThemeLocalize(m_pTheme, m_pWixLoc); + BalExitOnFailure(hr, "Failed to localize theme: %ls", sczThemePath); + + LExit: + ReleaseStr(sczThemePath); + + return hr; + } + + + HRESULT ParseOverridableVariablesFromXml( + __in IXMLDOMDocument* pixdManifest + ) + { + HRESULT hr = S_OK; + IXMLDOMNode* pNode = NULL; + IXMLDOMNodeList* pNodes = NULL; + DWORD cNodes = 0; + LPWSTR scz = NULL; + + // Get the list of variables users can override on the command line. + hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixStdbaOverridableVariable", &pNodes); + if (S_FALSE == hr) + { + ExitFunction1(hr = S_OK); + } + ExitOnFailure(hr, "Failed to select overridable variable nodes."); + + hr = pNodes->get_length((long*)&cNodes); + ExitOnFailure(hr, "Failed to get overridable variable node count."); + + if (cNodes) + { + hr = DictCreateStringList(&m_sdOverridableVariables, 32, DICT_FLAG_NONE); + ExitOnFailure(hr, "Failed to create the string dictionary."); + + for (DWORD i = 0; i < cNodes; ++i) + { + hr = XmlNextElement(pNodes, &pNode, NULL); + ExitOnFailure(hr, "Failed to get next node."); + + // @Name + hr = XmlGetAttributeEx(pNode, L"Name", &scz); + ExitOnFailure(hr, "Failed to get @Name."); + + hr = DictAddKey(m_sdOverridableVariables, scz); + ExitOnFailure(hr, "Failed to add \"%ls\" to the string dictionary.", scz); + + // prepare next iteration + ReleaseNullObject(pNode); + } + } + + LExit: + ReleaseObject(pNode); + ReleaseObject(pNodes); + ReleaseStr(scz); + return hr; + } + + + HRESULT InitializePackageInfo() + { + HRESULT hr = S_OK; + BAL_INFO_PACKAGE* pPackage = NULL; + + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) + { + pPackage = &m_Bundle.packages.rgPackages[i]; + + hr = InitializePackageInfoForPackage(pPackage); + BalExitOnFailure(hr, "Failed to initialize wixstdba package info for package: %ls.", pPackage->sczId); + } + + LExit: + return hr; + } + + + HRESULT InitializePackageInfoForPackage( + __in BAL_INFO_PACKAGE* pPackage + ) + { + HRESULT hr = S_OK; + + pPackage->pvCustomData = MemAlloc(sizeof(WIXSTDBA_PACKAGE_INFO), TRUE); + BalExitOnNull(pPackage->pvCustomData, hr, E_OUTOFMEMORY, "Failed to allocate memory for wixstdba package info."); + + LExit: + return hr; + } + + + HRESULT InitializePrerequisiteInformation() + { + HRESULT hr = S_OK; + BAL_INFO_PACKAGE* pPackage = NULL; + + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) + { + pPackage = &m_Bundle.packages.rgPackages[i]; + if (!pPackage->fPrereqPackage) + { + continue; + } + + if (pPackage->sczPrereqLicenseFile) + { + if (m_sczLicenseFile) + { + hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); + BalExitOnFailure(hr, "More than one license file specified in prerequisite info."); + } + + hr = StrAllocString(&m_sczLicenseFile, pPackage->sczPrereqLicenseFile, 0); + BalExitOnFailure(hr, "Failed to copy license file location from prereq package."); + } + + if (pPackage->sczPrereqLicenseUrl) + { + if (m_sczLicenseUrl) + { + hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); + BalExitOnFailure(hr, "More than one license URL specified in prerequisite info."); + } + + hr = StrAllocString(&m_sczLicenseUrl, pPackage->sczPrereqLicenseUrl, 0); + BalExitOnFailure(hr, "Failed to copy license URL from prereq package."); + } + } + + LExit: + return hr; + } + + + HRESULT ParseBootstrapperApplicationDataFromXml( + __in IXMLDOMDocument* pixdManifest + ) + { + HRESULT hr = S_OK; + IXMLDOMNode* pNode = NULL; + DWORD dwBool = 0; + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixStdbaInformation", &pNode); + if (S_FALSE == hr) + { + hr = E_INVALIDARG; + } + BalExitOnFailure(hr, "BootstrapperApplication.xml manifest is missing wixstdba information."); + + hr = XmlGetAttributeEx(pNode, L"LicenseFile", &m_sczLicenseFile); + if (E_NOTFOUND == hr) + { + hr = S_OK; + } + BalExitOnFailure(hr, "Failed to get license file."); + + hr = XmlGetAttributeEx(pNode, L"LicenseUrl", &m_sczLicenseUrl); + if (E_NOTFOUND == hr) + { + hr = S_OK; + } + BalExitOnFailure(hr, "Failed to get license URL."); + + ReleaseObject(pNode); + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixStdbaOptions", &pNode); + if (S_FALSE == hr) + { + ExitFunction1(hr = S_OK); + } + BalExitOnFailure(hr, "Failed to read wixstdba options from BootstrapperApplication.xml manifest."); + + hr = XmlGetAttributeNumber(pNode, L"SuppressOptionsUI", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr) && dwBool) + { + hr = BalSetNumericVariable(WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI, 1); + BalExitOnFailure(hr, "Failed to set '%ls' variable.", WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI); + } + BalExitOnFailure(hr, "Failed to get SuppressOptionsUI value."); + + dwBool = 0; + hr = XmlGetAttributeNumber(pNode, L"SuppressDowngradeFailure", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr)) + { + m_fSuppressDowngradeFailure = 0 < dwBool; + } + BalExitOnFailure(hr, "Failed to get SuppressDowngradeFailure value."); + + dwBool = 0; + hr = XmlGetAttributeNumber(pNode, L"SuppressRepair", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr)) + { + m_fSuppressRepair = 0 < dwBool; + } + BalExitOnFailure(hr, "Failed to get SuppressRepair value."); + + hr = XmlGetAttributeNumber(pNode, L"ShowVersion", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr) && dwBool) + { + hr = BalSetNumericVariable(WIXSTDBA_VARIABLE_SHOW_VERSION, 1); + BalExitOnFailure(hr, "Failed to set '%ls' variable.", WIXSTDBA_VARIABLE_SHOW_VERSION); + } + BalExitOnFailure(hr, "Failed to get ShowVersion value."); + + hr = XmlGetAttributeNumber(pNode, L"SupportCacheOnly", &dwBool); + if (S_FALSE == hr) + { + hr = S_OK; + } + else if (SUCCEEDED(hr)) + { + m_fSupportCacheOnly = 0 < dwBool; + } + BalExitOnFailure(hr, "Failed to get SupportCacheOnly value."); + + LExit: + ReleaseObject(pNode); + return hr; + } + + HRESULT GetPackageInfo( + __in_z LPCWSTR wzPackageId, + __out WIXSTDBA_PACKAGE_INFO** ppPackageInfo, + __out BAL_INFO_PACKAGE** ppPackage + ) + { + HRESULT hr = E_NOTFOUND; + WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; + BAL_INFO_PACKAGE* pPackage = NULL; + + Assert(wzPackageId && *wzPackageId); + Assert(ppPackage); + Assert(ppPackageInfo); + + hr = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); + if (E_NOTFOUND != hr) + { + ExitOnFailure(hr, "Failed trying to find the requested package."); + + pPackageInfo = reinterpret_cast(pPackage->pvCustomData); + } + + *ppPackageInfo = pPackageInfo; + *ppPackage = pPackage; + + LExit: + return hr; + } + + + // + // Get the file version of the bootstrapper and record in bootstrapper log file + // + HRESULT GetBundleFileVersion() + { + HRESULT hr = S_OK; + ULARGE_INTEGER uliVersion = { }; + LPWSTR sczCurrentPath = NULL; + VERUTIL_VERSION* pVersion = NULL; + + hr = PathForCurrentProcess(&sczCurrentPath, NULL); + BalExitOnFailure(hr, "Failed to get bundle path."); + + hr = FileVersion(sczCurrentPath, &uliVersion.HighPart, &uliVersion.LowPart); + BalExitOnFailure(hr, "Failed to get bundle file version."); + + hr = VerVersionFromQword(uliVersion.QuadPart, &pVersion); + BalExitOnFailure(hr, "Failed to create bundle file version."); + + hr = m_pEngine->SetVariableVersion(WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION, pVersion->sczVersion); + BalExitOnFailure(hr, "Failed to set WixBundleFileVersion variable."); + + LExit: + ReleaseVerutilVersion(pVersion); + ReleaseStr(sczCurrentPath); + + return hr; + } + + + // + // CreateMainWindow - creates the main install window. + // + HRESULT CreateMainWindow() + { + HRESULT hr = S_OK; + HICON hIcon = reinterpret_cast(m_pTheme->hIcon); + WNDCLASSW wc = { }; + DWORD dwWindowStyle = 0; + int x = CW_USEDEFAULT; + int y = CW_USEDEFAULT; + POINT ptCursor = { }; + + // If the theme did not provide an icon, try using the icon from the bundle engine. + if (!hIcon) + { + HMODULE hBootstrapperEngine = ::GetModuleHandleW(NULL); + if (hBootstrapperEngine) + { + hIcon = ::LoadIconW(hBootstrapperEngine, MAKEINTRESOURCEW(1)); + } + } + + // Register the window class and create the window. + wc.lpfnWndProc = CWixStandardBootstrapperApplication::WndProc; + wc.hInstance = m_hModule; + wc.hIcon = hIcon; + wc.hCursor = ::LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); + wc.hbrBackground = m_pTheme->rgFonts[m_pTheme->dwFontId].hBackground; + wc.lpszMenuName = NULL; + wc.lpszClassName = WIXSTDBA_WINDOW_CLASS; + if (!::RegisterClassW(&wc)) + { + ExitWithLastError(hr, "Failed to register window."); + } + + m_fRegistered = TRUE; + + // Calculate the window style based on the theme style and command display value. + dwWindowStyle = m_pTheme->dwStyle; + if (BOOTSTRAPPER_DISPLAY_NONE >= m_command.display) + { + dwWindowStyle &= ~WS_VISIBLE; + } + + // Don't show the window if there is a splash screen (it will be made visible when the splash screen is hidden) + if (::IsWindow(m_command.hwndSplashScreen)) + { + dwWindowStyle &= ~WS_VISIBLE; + } + + // Center the window on the monitor with the mouse. + if (::GetCursorPos(&ptCursor)) + { + x = ptCursor.x; + y = ptCursor.y; + } + + hr = ThemeCreateParentWindow(m_pTheme, 0, wc.lpszClassName, m_pTheme->sczCaption, dwWindowStyle, x, y, HWND_DESKTOP, m_hModule, this, THEME_WINDOW_INITIAL_POSITION_CENTER_MONITOR_FROM_COORDINATES, &m_hWnd); + ExitOnFailure(hr, "Failed to create window."); + + hr = S_OK; + + LExit: + return hr; + } + + + // + // InitializeTaskbarButton - initializes taskbar button for progress. + // + void InitializeTaskbarButton() + { + HRESULT hr = S_OK; + + hr = ::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, __uuidof(ITaskbarList3), reinterpret_cast(&m_pTaskbarList)); + if (REGDB_E_CLASSNOTREG == hr) // not supported before Windows 7 + { + ExitFunction1(hr = S_OK); + } + BalExitOnFailure(hr, "Failed to create ITaskbarList3. Continuing."); + + m_uTaskbarButtonCreatedMessage = ::RegisterWindowMessageW(L"TaskbarButtonCreated"); + BalExitOnNullWithLastError(m_uTaskbarButtonCreatedMessage, hr, "Failed to get TaskbarButtonCreated message. Continuing."); + + LExit: + return; + } + + // + // DestroyMainWindow - clean up all the window registration. + // + void DestroyMainWindow() + { + if (::IsWindow(m_hWnd)) + { + ::DestroyWindow(m_hWnd); + m_hWnd = NULL; + m_fTaskbarButtonOK = FALSE; + } + + if (m_fRegistered) + { + ::UnregisterClassW(WIXSTDBA_WINDOW_CLASS, m_hModule); + m_fRegistered = FALSE; + } + } + + + // + // UninitializeTaskbarButton - clean up the taskbar registration. + // + void UninitializeTaskbarButton() + { + m_fTaskbarButtonOK = FALSE; + ReleaseNullObject(m_pTaskbarList); + } + + + static LRESULT CallDefaultWndProc( + __in CWixStandardBootstrapperApplication* pBA, + __in HWND hWnd, + __in UINT uMsg, + __in WPARAM wParam, + __in LPARAM lParam + ) + { + LRESULT lres = NULL; + THEME* pTheme = NULL; + HRESULT hr = S_OK; + BA_FUNCTIONS_WNDPROC_ARGS wndProcArgs = { }; + BA_FUNCTIONS_WNDPROC_RESULTS wndProcResults = { }; + + if (pBA) + { + pTheme = pBA->m_pTheme; + + if (pBA->m_pfnBAFunctionsProc) + { + wndProcArgs.cbSize = sizeof(wndProcArgs); + wndProcArgs.pTheme = pTheme; + wndProcArgs.hWnd = hWnd; + wndProcArgs.uMsg = uMsg; + wndProcArgs.wParam = wParam; + wndProcArgs.lParam = lParam; + wndProcResults.cbSize = sizeof(wndProcResults); + + hr = pBA->m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_WNDPROC, &wndProcArgs, &wndProcResults, pBA->m_pvBAFunctionsProcContext); + if (E_NOTIMPL != hr) + { + lres = wndProcResults.lres; + ExitFunction(); + } + } + } + + lres = ThemeDefWindowProc(pTheme, hWnd, uMsg, wParam, lParam); + + LExit: + return lres; + } + + // + // WndProc - standard windows message handler. + // + static LRESULT CALLBACK WndProc( + __in HWND hWnd, + __in UINT uMsg, + __in WPARAM wParam, + __in LPARAM lParam + ) + { +#pragma warning(suppress:4312) + CWixStandardBootstrapperApplication* pBA = reinterpret_cast(::GetWindowLongPtrW(hWnd, GWLP_USERDATA)); + BOOL fCancel = FALSE; + + switch (uMsg) + { + case WM_NCCREATE: + { + LPCREATESTRUCT lpcs = reinterpret_cast(lParam); + pBA = reinterpret_cast(lpcs->lpCreateParams); +#pragma warning(suppress:4244) + ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, reinterpret_cast(pBA)); + } + break; + + case WM_NCDESTROY: + { + LRESULT lres = CallDefaultWndProc(pBA, hWnd, uMsg, wParam, lParam); + ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, 0); + ::PostQuitMessage(0); + return lres; + } + + case WM_CREATE: + if (!pBA->OnCreate(hWnd)) + { + return -1; + } + break; + + case WM_QUERYENDSESSION: + fCancel = true; + pBA->OnSystemShutdown(static_cast(lParam), &fCancel); + return !fCancel; + + case WM_CLOSE: + // If the user chose not to close, do *not* let the default window proc handle the message. + if (!pBA->OnClose()) + { + return 0; + } + break; + + case WM_WIXSTDBA_SHOW_HELP: + pBA->OnShowHelp(); + return 0; + + case WM_WIXSTDBA_DETECT_PACKAGES: + pBA->OnDetect(); + return 0; + + case WM_WIXSTDBA_PLAN_PACKAGES: + pBA->OnPlan(static_cast(lParam)); + return 0; + + case WM_WIXSTDBA_APPLY_PACKAGES: + pBA->OnApply(); + return 0; + + case WM_WIXSTDBA_CHANGE_STATE: + pBA->OnChangeState(static_cast(lParam)); + return 0; + + case WM_WIXSTDBA_SHOW_FAILURE: + pBA->OnShowFailure(); + return 0; + + case WM_COMMAND: + switch (HIWORD(wParam)) + { + case BN_CLICKED: + switch (LOWORD(wParam)) + { + case WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX: + pBA->OnClickAcceptCheckbox(); + return 0; + + case WIXSTDBA_CONTROL_INSTALL_BUTTON: + pBA->OnClickInstallButton(); + return 0; + + case WIXSTDBA_CONTROL_REPAIR_BUTTON: + pBA->OnClickRepairButton(); + return 0; + + case WIXSTDBA_CONTROL_UNINSTALL_BUTTON: + pBA->OnClickUninstallButton(); + return 0; + + case WIXSTDBA_CONTROL_LAUNCH_BUTTON: + pBA->OnClickLaunchButton(); + return 0; + + case WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON: __fallthrough; + case WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON: + pBA->OnClickRestartButton(); + return 0; + + case WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON: + pBA->OnClickCloseButton(); + return 0; + } + break; + } + break; + + case WM_NOTIFY: + if (lParam) + { + LPNMHDR pnmhdr = reinterpret_cast(lParam); + switch (pnmhdr->code) + { + case NM_CLICK: __fallthrough; + case NM_RETURN: + switch (static_cast(pnmhdr->idFrom)) + { + case WIXSTDBA_CONTROL_EULA_LINK: + pBA->OnClickEulaLink(); + return 1; + case WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK: + pBA->OnClickLogFileLink(); + return 1; + } + } + } + break; + } + + if (pBA && pBA->m_pTaskbarList && uMsg == pBA->m_uTaskbarButtonCreatedMessage) + { + pBA->m_fTaskbarButtonOK = TRUE; + return 0; + } + + return CallDefaultWndProc(pBA, hWnd, uMsg, wParam, lParam); + } + + + // + // OnCreate - finishes loading the theme. + // + BOOL OnCreate( + __in HWND /*hWnd*/ + ) + { + HRESULT hr = S_OK; + LPWSTR sczLicenseFormatted = NULL; + LPWSTR sczLicensePath = NULL; + LPWSTR sczLicenseDirectory = NULL; + LPWSTR sczLicenseFilename = NULL; + BA_FUNCTIONS_ONTHEMELOADED_ARGS themeLoadedArgs = { }; + BA_FUNCTIONS_ONTHEMELOADED_RESULTS themeLoadedResults = { }; + + hr = ThemeLoadControls(m_pTheme, vrgInitControls, countof(vrgInitControls)); + BalExitOnFailure(hr, "Failed to load theme controls."); + + C_ASSERT(COUNT_WIXSTDBA_PAGE == countof(vrgwzPageNames)); + C_ASSERT(countof(m_rgdwPageIds) == countof(vrgwzPageNames)); + + ThemeGetPageIds(m_pTheme, vrgwzPageNames, m_rgdwPageIds, countof(m_rgdwPageIds)); + + // Load the RTF EULA control with text if the control exists. + if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT)) + { + hr = (m_sczLicenseFile && *m_sczLicenseFile) ? S_OK : E_INVALIDDATA; + if (SUCCEEDED(hr)) + { + hr = StrAllocString(&sczLicenseFormatted, m_sczLicenseFile, 0); + if (SUCCEEDED(hr)) + { + hr = LocLocalizeString(m_pWixLoc, &sczLicenseFormatted); + if (SUCCEEDED(hr)) + { + // Assume there is no hidden variables to be formatted + // so don't worry about securely freeing it. + hr = BalFormatString(sczLicenseFormatted, &sczLicenseFormatted); + if (SUCCEEDED(hr)) + { + hr = PathRelativeToModule(&sczLicensePath, sczLicenseFormatted, m_hModule); + if (SUCCEEDED(hr)) + { + hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); + if (SUCCEEDED(hr)) + { + hr = StrAllocString(&sczLicenseFilename, PathFile(sczLicenseFormatted), 0); + if (SUCCEEDED(hr)) + { + hr = LocProbeForFile(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath); + if (SUCCEEDED(hr)) + { + hr = ThemeLoadRichEditFromFile(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT, sczLicensePath, m_hModule); + } + } + } + } + } + } + } + } + + if (FAILED(hr)) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Failed to load file into license richedit control from path '%ls' manifest value: %ls", sczLicensePath, m_sczLicenseFile); + hr = S_OK; + } + } + + if (m_pfnBAFunctionsProc) + { + themeLoadedArgs.cbSize = sizeof(themeLoadedArgs); + themeLoadedArgs.pTheme = m_pTheme; + themeLoadedArgs.pWixLoc = m_pWixLoc; + themeLoadedResults.cbSize = sizeof(themeLoadedResults); + hr = m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONTHEMELOADED, &themeLoadedArgs, &themeLoadedResults, m_pvBAFunctionsProcContext); + BalExitOnFailure(hr, "BAFunctions OnThemeLoaded failed."); + } + + LExit: + ReleaseStr(sczLicenseFilename); + ReleaseStr(sczLicenseDirectory); + ReleaseStr(sczLicensePath); + ReleaseStr(sczLicenseFormatted); + + return SUCCEEDED(hr); + } + + + // + // OnShowFailure - display the failure page. + // + void OnShowFailure() + { + SetState(WIXSTDBA_STATE_FAILED, S_OK); + + // If the UI should be visible, display it now and hide the splash screen + if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) + { + ::ShowWindow(m_pTheme->hwndParent, SW_SHOW); + } + + m_pEngine->CloseSplashScreen(); + + return; + } + + + // + // OnShowHelp - display the help page. + // + void OnShowHelp() + { + SetState(WIXSTDBA_STATE_HELP, S_OK); + + // If the UI should be visible, display it now and hide the splash screen + if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) + { + ::ShowWindow(m_pTheme->hwndParent, SW_SHOW); + } + + m_pEngine->CloseSplashScreen(); + + return; + } + + + // + // OnDetect - start the processing of packages. + // + void OnDetect() + { + HRESULT hr = S_OK; + + SetState(WIXSTDBA_STATE_DETECTING, hr); + + // If the UI should be visible, display it now and hide the splash screen + if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) + { + ::ShowWindow(m_pTheme->hwndParent, SW_SHOW); + } + + m_pEngine->CloseSplashScreen(); + + // Tell the core we're ready for the packages to be processed now. + hr = m_pEngine->Detect(); + BalExitOnFailure(hr, "Failed to start detecting chain."); + + LExit: + if (FAILED(hr)) + { + SetState(WIXSTDBA_STATE_DETECTING, hr); + } + + return; + } + + + // + // OnPlan - plan the detected changes. + // + void OnPlan( + __in BOOTSTRAPPER_ACTION action + ) + { + HRESULT hr = S_OK; + + m_plannedAction = action; + + // If we are going to apply a downgrade, bail. + if (m_fDowngrading && BOOTSTRAPPER_ACTION_UNINSTALL < action) + { + if (m_fSuppressDowngradeFailure) + { + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "A newer version of this product is installed but downgrade failure has been suppressed; continuing..."); + } + else + { + hr = HRESULT_FROM_WIN32(ERROR_PRODUCT_VERSION); + BalExitOnFailure(hr, "Cannot install a product when a newer version is installed."); + } + } + + SetState(WIXSTDBA_STATE_PLANNING, hr); + + hr = m_pEngine->Plan(action); + BalExitOnFailure(hr, "Failed to start planning packages."); + + LExit: + if (FAILED(hr)) + { + SetState(WIXSTDBA_STATE_PLANNING, hr); + } + + return; + } + + + // + // OnApply - apply the packages. + // + void OnApply() + { + HRESULT hr = S_OK; + + SetState(WIXSTDBA_STATE_APPLYING, hr); + SetProgressState(hr); + SetTaskbarButtonProgress(0); + + hr = m_pEngine->Apply(m_hWnd); + BalExitOnFailure(hr, "Failed to start applying packages."); + + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, TRUE); // ensure the cancel button is enabled before starting. + + LExit: + if (FAILED(hr)) + { + SetState(WIXSTDBA_STATE_APPLYING, hr); + } + + return; + } + + + // + // OnChangeState - change state. + // + void OnChangeState( + __in WIXSTDBA_STATE state + ) + { + WIXSTDBA_STATE stateOld = m_state; + DWORD dwOldPageId = 0; + DWORD dwNewPageId = 0; + LPWSTR sczText = NULL; + LPWSTR sczUnformattedText = NULL; + LPWSTR sczControlState = NULL; + LPWSTR sczControlName = NULL; + + m_state = state; + + // If our install is at the end (success or failure) and we're not showing full UI or + // we successfully installed the prerequisite then exit (prompt for restart if required). + if ((WIXSTDBA_STATE_APPLIED <= m_state && BOOTSTRAPPER_DISPLAY_FULL > m_command.display) || + (WIXSTDBA_STATE_APPLIED == m_state && m_fPrereq)) + { + // If a restart was required but we were not automatically allowed to + // accept the reboot then do the prompt. + if (m_fRestartRequired && !m_fAllowRestart) + { + StrAllocFromError(&sczUnformattedText, HRESULT_FROM_WIN32(ERROR_SUCCESS_REBOOT_REQUIRED), NULL); + + int nResult = ::MessageBoxW(m_hWnd, sczUnformattedText ? sczUnformattedText : L"The requested operation is successful. Changes will not be effective until the system is rebooted.", m_pTheme->sczCaption, MB_ICONEXCLAMATION | MB_OKCANCEL); + m_fAllowRestart = (IDOK == nResult); + } + + // Quietly exit. + ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); + } + else // try to change the pages. + { + DeterminePageId(stateOld, &dwOldPageId); + DeterminePageId(m_state, &dwNewPageId); + + if (dwOldPageId != dwNewPageId) + { + // Enable disable controls per-page. + if (m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL] == dwNewPageId) // on the "Install" page, ensure the install button is enabled/disabled correctly. + { + LONGLONG llElevated = 0; + if (m_Bundle.fPerMachine) + { + BalGetNumericVariable(WIXBUNDLE_VARIABLE_ELEVATED, &llElevated); + } + ThemeControlElevates(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON, (m_Bundle.fPerMachine && !llElevated)); + + // If the EULA control exists, show it only if a license URL is provided as well. + if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_EULA_LINK)) + { + BOOL fEulaLink = (m_sczLicenseUrl && *m_sczLicenseUrl); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_EULA_LINK, fEulaLink); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX, fEulaLink); + } + + BOOL fAcceptedLicense = !ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX) || !ThemeControlEnabled(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX) || ThemeIsControlChecked(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON, fAcceptedLicense); + } + else if (m_rgdwPageIds[WIXSTDBA_PAGE_MODIFY] == dwNewPageId) + { + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_REPAIR_BUTTON, !m_fSuppressRepair); + } + else if (m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS] == dwNewPageId) // on the "Success" page, check if the restart or launch button should be enabled. + { + BOOL fShowRestartButton = FALSE; + BOOL fLaunchTargetExists = FALSE; + if (m_fRestartRequired) + { + if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart) + { + fShowRestartButton = TRUE; + } + } + else if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON)) + { + fLaunchTargetExists = BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); + } + + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON, fLaunchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < m_plannedAction); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, fShowRestartButton); + } + else if (m_rgdwPageIds[WIXSTDBA_PAGE_FAILURE] == dwNewPageId) // on the "Failure" page, show error message and check if the restart button should be enabled. + { + BOOL fShowLogLink = (m_Bundle.sczLogVariable && *m_Bundle.sczLogVariable); // if there is a log file variable then we'll assume the log file exists. + BOOL fShowErrorMessage = FALSE; + BOOL fShowRestartButton = FALSE; + + if (FAILED(m_hrFinal)) + { + // If we know the failure message, use that. + if (m_sczFailedMessage && *m_sczFailedMessage) + { + StrAllocString(&sczUnformattedText, m_sczFailedMessage, 0); + } + else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal) + { + HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.NET452WIN7RTMErrorMessage)", 0); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to initialize NET452WIN7RTMErrorMessage loc identifier."); + } + else + { + hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to localize NET452WIN7RTMErrorMessage: %ls", sczUnformattedText); + ReleaseNullStr(sczUnformattedText); + } + } + } + else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal) + { + HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.SCDRUNTIMEFAILUREErrorMessage)", 0); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to initialize SCDRUNTIMEFAILUREErrorMessage loc identifier."); + } + else + { + hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to localize SCDRUNTIMEFAILUREErrorMessage: %ls", sczUnformattedText); + ReleaseNullStr(sczUnformattedText); + } + } + } + else // try to get the error message from the error code. + { + StrAllocFromError(&sczUnformattedText, m_hrFinal, NULL); + if (!sczUnformattedText || !*sczUnformattedText) + { + StrAllocFromError(&sczUnformattedText, E_FAIL, NULL); + } + } + + if (E_WIXSTDBA_CONDITION_FAILED == m_hrFinal) + { + if (sczUnformattedText) + { + StrAllocString(&sczText, sczUnformattedText, 0); + } + } + else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal) + { + if (sczUnformattedText) + { + BalFormatString(sczUnformattedText, &sczText); + } + } + else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal) + { + if (sczUnformattedText) + { + BalFormatString(sczUnformattedText, &sczText); + } + } + else + { + StrAllocFormatted(&sczText, L"0x%08x - %ls", m_hrFinal, sczUnformattedText); + } + + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, sczText); + fShowErrorMessage = TRUE; + } + + if (m_fRestartRequired) + { + if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart) + { + fShowRestartButton = TRUE; + } + } + + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, fShowLogLink); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, fShowErrorMessage); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, fShowRestartButton); + } + + HRESULT hr = ThemeShowPage(m_pTheme, dwOldPageId, SW_HIDE); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to hide page: %u", dwOldPageId); + } + + hr = ThemeShowPage(m_pTheme, dwNewPageId, SW_SHOW); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to show page: %u", dwOldPageId); + } + + // On the install page set the focus to the install button or the next enabled control if install is disabled. + if (m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL] == dwNewPageId) + { + ThemeSetFocus(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON); + } + } + } + + ReleaseStr(sczText); + ReleaseStr(sczUnformattedText); + ReleaseStr(sczControlState); + ReleaseStr(sczControlName); + } + + + // + // OnClose - called when the window is trying to be closed. + // + BOOL OnClose() + { + BOOL fClose = FALSE; + BOOL fCancel = FALSE; + + // If we've already succeeded or failed or showing the help page, just close (prompts are annoying if the bootstrapper is done). + if (WIXSTDBA_STATE_APPLIED <= m_state || WIXSTDBA_STATE_HELP == m_state) + { + fClose = TRUE; + } + else // prompt the user or force the cancel if there is no UI. + { + ::EnterCriticalSection(&m_csShowingInternalUiThisPackage); + fClose = PromptCancel( + m_hWnd, + BOOTSTRAPPER_DISPLAY_FULL != m_command.display || m_fShowingInternalUiThisPackage, + m_sczConfirmCloseMessage ? m_sczConfirmCloseMessage : L"Are you sure you want to cancel?", + m_pTheme->sczCaption); + ::LeaveCriticalSection(&m_csShowingInternalUiThisPackage); + + fCancel = fClose; + } + + // If we're doing progress then we never close, we just cancel to let rollback occur. + if (WIXSTDBA_STATE_APPLYING <= m_state && WIXSTDBA_STATE_APPLIED > m_state) + { + // If we canceled, disable cancel button since clicking it again is silly. + if (fClose) + { + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, FALSE); + } + + fClose = FALSE; + } + + if (fClose) + { + DWORD dwCurrentPageId = 0; + DeterminePageId(m_state, &dwCurrentPageId); + + // Hide the current page to let thmutil do its thing with variables. + ThemeShowPageEx(m_pTheme, dwCurrentPageId, SW_HIDE, fCancel ? THEME_SHOW_PAGE_REASON_CANCEL : THEME_SHOW_PAGE_REASON_DEFAULT); + } + + return fClose; + } + + + // + // OnClickAcceptCheckbox - allow the install to continue. + // + void OnClickAcceptCheckbox() + { + BOOL fAcceptedLicense = ThemeIsControlChecked(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX); + ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON, fAcceptedLicense); + } + + + // + // OnClickInstallButton - start the install by planning the packages. + // + void OnClickInstallButton() + { + this->OnPlan(BOOTSTRAPPER_ACTION_INSTALL); + } + + + // + // OnClickRepairButton - start the repair. + // + void OnClickRepairButton() + { + this->OnPlan(BOOTSTRAPPER_ACTION_REPAIR); + } + + + // + // OnClickUninstallButton - start the uninstall. + // + void OnClickUninstallButton() + { + this->OnPlan(BOOTSTRAPPER_ACTION_UNINSTALL); + } + + + // + // OnClickCloseButton - close the application. + // + void OnClickCloseButton() + { + ::SendMessageW(m_hWnd, WM_CLOSE, 0, 0); + } + + + // + // OnClickEulaLink - show the end user license agreement. + // + void OnClickEulaLink() + { + HRESULT hr = S_OK; + LPWSTR sczLicenseUrl = NULL; + LPWSTR sczLicensePath = NULL; + LPWSTR sczLicenseDirectory = NULL; + LPWSTR sczLicenseFilename = NULL; + URI_PROTOCOL protocol = URI_PROTOCOL_UNKNOWN; + + hr = StrAllocString(&sczLicenseUrl, m_sczLicenseUrl, 0); + BalExitOnFailure(hr, "Failed to copy license URL: %ls", m_sczLicenseUrl); + + hr = LocLocalizeString(m_pWixLoc, &sczLicenseUrl); + BalExitOnFailure(hr, "Failed to localize license URL: %ls", m_sczLicenseUrl); + + // Assume there is no hidden variables to be formatted + // so don't worry about securely freeing it. + hr = BalFormatString(sczLicenseUrl, &sczLicenseUrl); + BalExitOnFailure(hr, "Failed to get formatted license URL: %ls", m_sczLicenseUrl); + + hr = UriProtocol(sczLicenseUrl, &protocol); + if (FAILED(hr) || URI_PROTOCOL_UNKNOWN == protocol) + { + // Probe for localized license file + hr = PathRelativeToModule(&sczLicensePath, sczLicenseUrl, m_hModule); + if (SUCCEEDED(hr)) + { + hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); + if (SUCCEEDED(hr)) + { + hr = LocProbeForFile(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath); + } + } + } + + hr = ShelExecUnelevated(sczLicensePath ? sczLicensePath : sczLicenseUrl, NULL, L"open", NULL, SW_SHOWDEFAULT); + BalExitOnFailure(hr, "Failed to launch URL to EULA."); + + LExit: + ReleaseStr(sczLicensePath); + ReleaseStr(sczLicenseUrl); + ReleaseStr(sczLicenseDirectory); + ReleaseStr(sczLicenseFilename); + + return; + } + + + // + // OnClickLaunchButton - launch the app from the success page. + // + void OnClickLaunchButton() + { + HRESULT hr = S_OK; + LPWSTR sczUnformattedLaunchTarget = NULL; + LPWSTR sczLaunchTarget = NULL; + LPWSTR sczLaunchTargetElevatedId = NULL; + LPWSTR sczUnformattedArguments = NULL; + LPWSTR sczArguments = NULL; + LPWSTR sczUnformattedLaunchFolder = NULL; + LPWSTR sczLaunchFolder = NULL; + int nCmdShow = SW_SHOWNORMAL; + + hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH, &sczUnformattedLaunchTarget); + BalExitOnFailure(hr, "Failed to get launch target variable '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); + + hr = BalFormatString(sczUnformattedLaunchTarget, &sczLaunchTarget); + BalExitOnFailure(hr, "Failed to format launch target variable: %ls", sczUnformattedLaunchTarget); + + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID)) + { + hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID, &sczLaunchTargetElevatedId); + BalExitOnFailure(hr, "Failed to get launch target elevated id '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID); + } + + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS)) + { + hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS, &sczUnformattedArguments); + BalExitOnFailure(hr, "Failed to get launch arguments '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS); + } + + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_HIDDEN)) + { + nCmdShow = SW_HIDE; + } + + if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER)) + { + hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER, &sczUnformattedLaunchFolder); + BalExitOnFailure(hr, "Failed to get launch working directory variable '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER); + } + + if (sczLaunchTargetElevatedId && !m_fTriedToLaunchElevated) + { + m_fTriedToLaunchElevated = TRUE; + hr = m_pEngine->LaunchApprovedExe(m_hWnd, sczLaunchTargetElevatedId, sczUnformattedArguments, 0); + if (FAILED(hr)) + { + BalLogError(hr, "Failed to launch elevated target: %ls", sczLaunchTargetElevatedId); + + //try with ShelExec next time + OnClickLaunchButton(); + } + } + else + { + if (sczUnformattedArguments) + { + hr = BalFormatString(sczUnformattedArguments, &sczArguments); + BalExitOnFailure(hr, "Failed to format launch arguments variable: %ls", sczUnformattedArguments); + } + + if (sczUnformattedLaunchFolder) + { + hr = BalFormatString(sczUnformattedLaunchFolder, &sczLaunchFolder); + BalExitOnFailure(hr, "Failed to format launch working directory variable: %ls", sczUnformattedLaunchFolder); + } + + hr = ShelExec(sczLaunchTarget, sczArguments, L"open", sczLaunchFolder, nCmdShow, m_hWnd, NULL); + BalExitOnFailure(hr, "Failed to launch target: %ls", sczLaunchTarget); + + ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); + } + + LExit: + StrSecureZeroFreeString(sczLaunchFolder); + ReleaseStr(sczUnformattedLaunchFolder); + StrSecureZeroFreeString(sczArguments); + ReleaseStr(sczUnformattedArguments); + ReleaseStr(sczLaunchTargetElevatedId); + StrSecureZeroFreeString(sczLaunchTarget); + ReleaseStr(sczUnformattedLaunchTarget); + + return; + } + + + // + // OnClickRestartButton - allows the restart and closes the app. + // + void OnClickRestartButton() + { + AssertSz(m_fRestartRequired, "Restart must be requested to be able to click on the restart button."); + + m_fAllowRestart = TRUE; + ::SendMessageW(m_hWnd, WM_CLOSE, 0, 0); + + return; + } + + + // + // OnClickLogFileLink - show the log file. + // + void OnClickLogFileLink() + { + HRESULT hr = S_OK; + LPWSTR sczLogFile = NULL; + + hr = BalGetStringVariable(m_Bundle.sczLogVariable, &sczLogFile); + BalExitOnFailure(hr, "Failed to get log file variable '%ls'.", m_Bundle.sczLogVariable); + + hr = ShelExecUnelevated(L"notepad.exe", sczLogFile, L"open", NULL, SW_SHOWDEFAULT); + BalExitOnFailure(hr, "Failed to open log file target: %ls", sczLogFile); + + LExit: + ReleaseStr(sczLogFile); + + return; + } + + + // + // SetState + // + void SetState( + __in WIXSTDBA_STATE state, + __in HRESULT hrStatus + ) + { + if (FAILED(hrStatus)) + { + m_hrFinal = hrStatus; + } + + if (FAILED(m_hrFinal)) + { + state = WIXSTDBA_STATE_FAILED; + } + + if (m_state < state) + { + ::PostMessageW(m_hWnd, WM_WIXSTDBA_CHANGE_STATE, 0, state); + } + } + + + void DeterminePageId( + __in WIXSTDBA_STATE state, + __out DWORD* pdwPageId + ) + { + if (BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display) + { + switch (state) + { + case WIXSTDBA_STATE_INITIALIZED: + *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_command.action ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING]; + break; + + case WIXSTDBA_STATE_HELP: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_HELP]; + break; + + case WIXSTDBA_STATE_DETECTING: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_LOADING] ? m_rgdwPageIds[WIXSTDBA_PAGE_LOADING] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] ? m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS]; + break; + + case WIXSTDBA_STATE_DETECTED: __fallthrough; + case WIXSTDBA_STATE_PLANNING: __fallthrough; + case WIXSTDBA_STATE_PLANNED: __fallthrough; + case WIXSTDBA_STATE_APPLYING: __fallthrough; + case WIXSTDBA_STATE_CACHING: __fallthrough; + case WIXSTDBA_STATE_CACHED: __fallthrough; + case WIXSTDBA_STATE_EXECUTING: __fallthrough; + case WIXSTDBA_STATE_EXECUTED: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] ? m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS]; + break; + + default: + *pdwPageId = 0; + break; + } + } + else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display) + { + switch (state) + { + case WIXSTDBA_STATE_INITIALIZING: + *pdwPageId = 0; + break; + + case WIXSTDBA_STATE_INITIALIZED: + *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_command.action ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING]; + break; + + case WIXSTDBA_STATE_HELP: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_HELP]; + break; + + case WIXSTDBA_STATE_DETECTING: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_LOADING]; + break; + + case WIXSTDBA_STATE_DETECTED: + switch (m_command.action) + { + case BOOTSTRAPPER_ACTION_INSTALL: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL]; + break; + + case BOOTSTRAPPER_ACTION_MODIFY: __fallthrough; + case BOOTSTRAPPER_ACTION_REPAIR: __fallthrough; + case BOOTSTRAPPER_ACTION_UNINSTALL: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_MODIFY]; + break; + } + break; + + case WIXSTDBA_STATE_PLANNING: __fallthrough; + case WIXSTDBA_STATE_PLANNED: __fallthrough; + case WIXSTDBA_STATE_APPLYING: __fallthrough; + case WIXSTDBA_STATE_CACHING: __fallthrough; + case WIXSTDBA_STATE_CACHED: __fallthrough; + case WIXSTDBA_STATE_EXECUTING: __fallthrough; + case WIXSTDBA_STATE_EXECUTED: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS]; + break; + + case WIXSTDBA_STATE_APPLIED: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS]; + break; + + case WIXSTDBA_STATE_FAILED: + *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_FAILURE]; + break; + } + } + } + + + HRESULT EvaluateConditions() + { + HRESULT hr = S_OK; + BOOL fResult = FALSE; + + for (DWORD i = 0; i < m_Conditions.cConditions; ++i) + { + BAL_CONDITION* pCondition = m_Conditions.rgConditions + i; + + hr = BalConditionEvaluate(pCondition, m_pEngine, &fResult, &m_sczFailedMessage); + BalExitOnFailure(hr, "Failed to evaluate condition."); + + if (!fResult) + { + hr = E_WIXSTDBA_CONDITION_FAILED; + BalExitOnFailure(hr, "%ls", m_sczFailedMessage); + } + } + + ReleaseNullStrSecure(m_sczFailedMessage); + + LExit: + return hr; + } + + void UpdateCacheProgress( + __in DWORD dwOverallPercentage + ) + { + WCHAR wzProgress[5] = { }; + + ::StringCchPrintfW(wzProgress, countof(wzProgress), L"%u%%", dwOverallPercentage); + ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_TEXT, wzProgress); + + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_BAR, dwOverallPercentage); + + m_dwCalculatedCacheProgress = dwOverallPercentage * WIXSTDBA_ACQUIRE_PERCENTAGE / 100; + ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); + + SetTaskbarButtonProgress(m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); + } + + + void SetTaskbarButtonProgress( + __in DWORD dwOverallPercentage + ) + { + HRESULT hr = S_OK; + + if (m_fTaskbarButtonOK) + { + hr = m_pTaskbarList->SetProgressValue(m_hWnd, dwOverallPercentage, 100UL); + BalExitOnFailure(hr, "Failed to set taskbar button progress to: %d%%.", dwOverallPercentage); + } + + LExit: + return; + } + + + void SetTaskbarButtonState( + __in TBPFLAG tbpFlags + ) + { + HRESULT hr = S_OK; + + if (m_fTaskbarButtonOK) + { + hr = m_pTaskbarList->SetProgressState(m_hWnd, tbpFlags); + BalExitOnFailure(hr, "Failed to set taskbar button state.", tbpFlags); + } + + LExit: + return; + } + + + void SetProgressState( + __in HRESULT hrStatus + ) + { + TBPFLAG flag = TBPF_NORMAL; + + if (IsCanceled() || HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT) == hrStatus) + { + flag = TBPF_PAUSED; + } + else if (IsRollingBack() || FAILED(hrStatus)) + { + flag = TBPF_ERROR; + } + + SetTaskbarButtonState(flag); + } + + + HRESULT LoadBAFunctions( + __in IXMLDOMDocument* pixdManifest + ) + { + HRESULT hr = S_OK; + IXMLDOMNode* pBAFunctionsNode = NULL; + IXMLDOMNode* pPayloadNode = NULL; + LPWSTR sczPayloadId = NULL; + LPWSTR sczPayloadXPath = NULL; + LPWSTR sczBafName = NULL; + LPWSTR sczBafPath = NULL; + BA_FUNCTIONS_CREATE_ARGS bafCreateArgs = { }; + BA_FUNCTIONS_CREATE_RESULTS bafCreateResults = { }; + + hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBalBAFunctions", &pBAFunctionsNode); + BalExitOnFailure(hr, "Failed to read WixBalBAFunctions node from BootstrapperApplicationData.xml."); + + if (S_FALSE == hr) + { + ExitFunction(); + } + + hr = XmlGetAttributeEx(pBAFunctionsNode, L"PayloadId", &sczPayloadId); + BalExitOnFailure(hr, "Failed to get BAFunctions PayloadId."); + + hr = StrAllocFormatted(&sczPayloadXPath, L"/BootstrapperApplicationData/WixPayloadProperties[@Payload='%ls']", sczPayloadId); + BalExitOnFailure(hr, "Failed to format BAFunctions payload XPath."); + + hr = XmlSelectSingleNode(pixdManifest, sczPayloadXPath, &pPayloadNode); + if (S_FALSE == hr) + { + hr = E_NOTFOUND; + } + BalExitOnFailure(hr, "Failed to find WixPayloadProperties node for BAFunctions PayloadId: %ls.", sczPayloadId); + + hr = XmlGetAttributeEx(pPayloadNode, L"Name", &sczBafName); + BalExitOnFailure(hr, "Failed to get BAFunctions Name."); + + hr = PathRelativeToModule(&sczBafPath, sczBafName, m_hModule); + BalExitOnFailure(hr, "Failed to get path to BAFunctions DLL."); + + BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: LoadBAFunctions() - BAFunctions DLL %ls", sczBafPath); + + m_hBAFModule = ::LoadLibraryExW(sczBafPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); + BalExitOnNullWithLastError(m_hBAFModule, hr, "WIXSTDBA: LoadBAFunctions() - Failed to load DLL %ls", sczBafPath); + + PFN_BA_FUNCTIONS_CREATE pfnBAFunctionsCreate = reinterpret_cast(::GetProcAddress(m_hBAFModule, "BAFunctionsCreate")); + BalExitOnNullWithLastError(pfnBAFunctionsCreate, hr, "Failed to get BAFunctionsCreate entry-point from: %ls", sczBafPath); + + bafCreateArgs.cbSize = sizeof(bafCreateArgs); + bafCreateArgs.qwBAFunctionsAPIVersion = MAKEQWORDVERSION(0, 0, 0, 2); // TODO: need to decide whether to keep this, and if so when to update it. + bafCreateArgs.pBootstrapperCreateArgs = &m_createArgs; + + bafCreateResults.cbSize = sizeof(bafCreateResults); + + hr = pfnBAFunctionsCreate(&bafCreateArgs, &bafCreateResults); + BalExitOnFailure(hr, "Failed to create BAFunctions."); + + m_pfnBAFunctionsProc = bafCreateResults.pfnBAFunctionsProc; + m_pvBAFunctionsProcContext = bafCreateResults.pvBAFunctionsProcContext; + + LExit: + if (m_hBAFModule && !m_pfnBAFunctionsProc) + { + ::FreeLibrary(m_hBAFModule); + m_hBAFModule = NULL; + } + ReleaseStr(sczBafPath); + ReleaseStr(sczBafName); + ReleaseStr(sczPayloadXPath); + ReleaseStr(sczPayloadId); + ReleaseObject(pBAFunctionsNode); + ReleaseObject(pPayloadNode); + + return hr; + } + + +public: + // + // Constructor - initialize member variables. + // + CWixStandardBootstrapperApplication( + __in HMODULE hModule, + __in BOOL fPrereq, + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs + ) : CBalBaseBootstrapperApplication(pEngine, pArgs, 3, 3000) + { + m_hModule = hModule; + memcpy_s(&m_command, sizeof(m_command), pArgs->pCommand, sizeof(BOOTSTRAPPER_COMMAND)); + memcpy_s(&m_createArgs, sizeof(m_createArgs), pArgs, sizeof(BOOTSTRAPPER_CREATE_ARGS)); + m_createArgs.pCommand = &m_command; + + if (fPrereq) + { + // Pre-req BA should only show help or do an install (to launch the Managed BA which can then do the right action). + if (BOOTSTRAPPER_ACTION_HELP != m_command.action) + { + m_command.action = BOOTSTRAPPER_ACTION_INSTALL; + } + } + else // maybe modify the action state if the bundle is or is not already installed. + { + LONGLONG llInstalled = 0; + HRESULT hr = BalGetNumericVariable(L"WixBundleInstalled", &llInstalled); + if (SUCCEEDED(hr) && BOOTSTRAPPER_RESUME_TYPE_REBOOT != m_command.resumeType && 0 < llInstalled && BOOTSTRAPPER_ACTION_INSTALL == m_command.action) + { + m_command.action = BOOTSTRAPPER_ACTION_MODIFY; + } + else if (0 == llInstalled && (BOOTSTRAPPER_ACTION_MODIFY == m_command.action || BOOTSTRAPPER_ACTION_REPAIR == m_command.action)) + { + m_command.action = BOOTSTRAPPER_ACTION_INSTALL; + } + } + + m_plannedAction = BOOTSTRAPPER_ACTION_UNKNOWN; + + // When resuming from restart doing some install-like operation, try to find the package that forced the + // restart. We'll use this information during planning. + m_sczAfterForcedRestartPackage = NULL; + + if (BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType && BOOTSTRAPPER_ACTION_UNINSTALL < m_command.action) + { + // Ensure the forced restart package variable is null when it is an empty string. + HRESULT hr = BalGetStringVariable(L"WixBundleForcedRestartPackage", &m_sczAfterForcedRestartPackage); + if (FAILED(hr) || !m_sczAfterForcedRestartPackage || !*m_sczAfterForcedRestartPackage) + { + ReleaseNullStr(m_sczAfterForcedRestartPackage); + } + } + + m_pWixLoc = NULL; + memset(&m_Bundle, 0, sizeof(m_Bundle)); + memset(&m_Conditions, 0, sizeof(m_Conditions)); + m_sczConfirmCloseMessage = NULL; + m_sczFailedMessage = NULL; + + m_sczLanguage = NULL; + m_pTheme = NULL; + memset(m_rgdwPageIds, 0, sizeof(m_rgdwPageIds)); + m_hUiThread = NULL; + m_fRegistered = FALSE; + m_hWnd = NULL; + + m_state = WIXSTDBA_STATE_INITIALIZING; + m_hrFinal = hrHostInitialization; + + m_fDowngrading = FALSE; + m_restartResult = BOOTSTRAPPER_APPLY_RESTART_NONE; + m_fRestartRequired = FALSE; + m_fAllowRestart = FALSE; + + m_sczLicenseFile = NULL; + m_sczLicenseUrl = NULL; + m_fSuppressDowngradeFailure = FALSE; + m_fSuppressRepair = FALSE; + m_fSupportCacheOnly = FALSE; + + m_sdOverridableVariables = NULL; + m_pTaskbarList = NULL; + m_uTaskbarButtonCreatedMessage = UINT_MAX; + m_fTaskbarButtonOK = FALSE; + ::InitializeCriticalSection(&m_csShowingInternalUiThisPackage); + m_fShowingInternalUiThisPackage = FALSE; + m_fTriedToLaunchElevated = FALSE; + + m_fPrereq = fPrereq; + m_fPrereqInstalled = FALSE; + m_fPrereqAlreadyInstalled = FALSE; + + pEngine->AddRef(); + m_pEngine = pEngine; + + m_hBAFModule = NULL; + m_pfnBAFunctionsProc = NULL; + m_pvBAFunctionsProcContext = NULL; + } + + + // + // Destructor - release member variables. + // + ~CWixStandardBootstrapperApplication() + { + AssertSz(!::IsWindow(m_hWnd), "Window should have been destroyed before destructor."); + AssertSz(!m_pTaskbarList, "Taskbar should have been released before destructor."); + AssertSz(!m_pTheme, "Theme should have been released before destructor."); + + for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) + { + ReleaseMem(m_Bundle.packages.rgPackages[i].pvCustomData); + } + + ::DeleteCriticalSection(&m_csShowingInternalUiThisPackage); + ReleaseDict(m_sdOverridableVariables); + ReleaseStr(m_sczFailedMessage); + ReleaseStr(m_sczConfirmCloseMessage); + BalConditionsUninitialize(&m_Conditions); + BalInfoUninitialize(&m_Bundle); + LocFree(m_pWixLoc); + + ReleaseStr(m_sczLanguage); + ReleaseStr(m_sczLicenseFile); + ReleaseStr(m_sczLicenseUrl); + ReleaseStr(m_sczAfterForcedRestartPackage); + ReleaseNullObject(m_pEngine); + + if (m_hBAFModule) + { + PFN_BA_FUNCTIONS_DESTROY pfnBAFunctionsDestroy = reinterpret_cast(::GetProcAddress(m_hBAFModule, "BAFunctionsDestroy")); + if (pfnBAFunctionsDestroy) + { + pfnBAFunctionsDestroy(); + } + + ::FreeLibrary(m_hBAFModule); + m_hBAFModule = NULL; + } + } + +private: + HMODULE m_hModule; + BOOTSTRAPPER_CREATE_ARGS m_createArgs; + BOOTSTRAPPER_COMMAND m_command; + IBootstrapperEngine* m_pEngine; + BOOTSTRAPPER_ACTION m_plannedAction; + + LPWSTR m_sczAfterForcedRestartPackage; + + WIX_LOCALIZATION* m_pWixLoc; + BAL_INFO_BUNDLE m_Bundle; + BAL_CONDITIONS m_Conditions; + LPWSTR m_sczFailedMessage; + LPWSTR m_sczConfirmCloseMessage; + + LPWSTR m_sczLanguage; + THEME* m_pTheme; + DWORD m_rgdwPageIds[countof(vrgwzPageNames)]; + HANDLE m_hUiThread; + BOOL m_fRegistered; + HWND m_hWnd; + + WIXSTDBA_STATE m_state; + HRESULT m_hrFinal; + + BOOL m_fStartedExecution; + DWORD m_dwCalculatedCacheProgress; + DWORD m_dwCalculatedExecuteProgress; + + BOOL m_fDowngrading; + BOOTSTRAPPER_APPLY_RESTART m_restartResult; + BOOL m_fRestartRequired; + BOOL m_fAllowRestart; + + LPWSTR m_sczLicenseFile; + LPWSTR m_sczLicenseUrl; + BOOL m_fSuppressDowngradeFailure; + BOOL m_fSuppressRepair; + BOOL m_fSupportCacheOnly; + + STRINGDICT_HANDLE m_sdOverridableVariables; + + BOOL m_fPrereq; + BOOL m_fPrereqInstalled; + BOOL m_fPrereqAlreadyInstalled; + + ITaskbarList3* m_pTaskbarList; + UINT m_uTaskbarButtonCreatedMessage; + BOOL m_fTaskbarButtonOK; + CRITICAL_SECTION m_csShowingInternalUiThisPackage; + BOOL m_fShowingInternalUiThisPackage; + BOOL m_fTriedToLaunchElevated; + + HMODULE m_hBAFModule; + PFN_BA_FUNCTIONS_PROC m_pfnBAFunctionsProc; + LPVOID m_pvBAFunctionsProcContext; +}; + + +// +// CreateBootstrapperApplication - creates a new IBootstrapperApplication object. +// +HRESULT CreateBootstrapperApplication( + __in HMODULE hModule, + __in BOOL fPrereq, + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults, + __out IBootstrapperApplication** ppApplication + ) +{ + HRESULT hr = S_OK; + CWixStandardBootstrapperApplication* pApplication = NULL; + + if (BOOTSTRAPPER_DISPLAY_UNKNOWN == pArgs->pCommand->display) + { + BalExitOnFailure(hr = E_INVALIDARG, "Engine requested Unknown display type."); + } + + pApplication = new CWixStandardBootstrapperApplication(hModule, fPrereq, hrHostInitialization, pEngine, pArgs); + ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new standard bootstrapper application object."); + + pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; + pResults->pvBootstrapperApplicationProcContext = pApplication; + *ppApplication = pApplication; + pApplication = NULL; + +LExit: + ReleaseObject(pApplication); + return hr; +} + + +static HRESULT DAPI EvaluateVariableConditionCallback( + __in_z LPCWSTR wzCondition, + __out BOOL* pf, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalEvaluateCondition(wzCondition, pf); +} + + +static HRESULT DAPI FormatVariableStringCallback( + __in_z LPCWSTR wzFormat, + __inout LPWSTR* psczOut, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalFormatString(wzFormat, psczOut); +} + + +static HRESULT DAPI GetVariableNumericCallback( + __in_z LPCWSTR wzVariable, + __out LONGLONG* pllValue, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalGetNumericVariable(wzVariable, pllValue); +} + + +static HRESULT DAPI SetVariableNumericCallback( + __in_z LPCWSTR wzVariable, + __in LONGLONG llValue, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalSetNumericVariable(wzVariable, llValue); +} + + +static HRESULT DAPI GetVariableStringCallback( + __in_z LPCWSTR wzVariable, + __inout LPWSTR* psczValue, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalGetStringVariable(wzVariable, psczValue); +} + + +static HRESULT DAPI SetVariableStringCallback( + __in_z LPCWSTR wzVariable, + __in_z_opt LPCWSTR wzValue, + __in BOOL fFormatted, + __in_opt LPVOID /*pvContext*/ + ) +{ + return BalSetStringVariable(wzVariable, wzValue, fFormatted); +} + +static LPCSTR LoggingRequestStateToString( + __in BOOTSTRAPPER_REQUEST_STATE requestState + ) +{ + switch (requestState) + { + case BOOTSTRAPPER_REQUEST_STATE_NONE: + return "None"; + case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT: + return "ForceAbsent"; + case BOOTSTRAPPER_REQUEST_STATE_ABSENT: + return "Absent"; + case BOOTSTRAPPER_REQUEST_STATE_CACHE: + return "Cache"; + case BOOTSTRAPPER_REQUEST_STATE_PRESENT: + return "Present"; + case BOOTSTRAPPER_REQUEST_STATE_REPAIR: + return "Repair"; + default: + return "Invalid"; + } +} + +static LPCSTR LoggingMsiFeatureStateToString( + __in BOOTSTRAPPER_FEATURE_STATE featureState + ) +{ + switch (featureState) + { + case BOOTSTRAPPER_FEATURE_STATE_UNKNOWN: + return "Unknown"; + case BOOTSTRAPPER_FEATURE_STATE_ABSENT: + return "Absent"; + case BOOTSTRAPPER_FEATURE_STATE_ADVERTISED: + return "Advertised"; + case BOOTSTRAPPER_FEATURE_STATE_LOCAL: + return "Local"; + case BOOTSTRAPPER_FEATURE_STATE_SOURCE: + return "Source"; + default: + return "Invalid"; + } +} diff --git a/src/ext/Bal/wixstdba/packages.config b/src/ext/Bal/wixstdba/packages.config new file mode 100644 index 00000000..071284ac --- /dev/null +++ b/src/ext/Bal/wixstdba/packages.config @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/src/ext/Bal/wixstdba/precomp.cpp b/src/ext/Bal/wixstdba/precomp.cpp new file mode 100644 index 00000000..37664a1c --- /dev/null +++ b/src/ext/Bal/wixstdba/precomp.cpp @@ -0,0 +1,3 @@ +// 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. + +#include "precomp.h" diff --git a/src/ext/Bal/wixstdba/precomp.h b/src/ext/Bal/wixstdba/precomp.h new file mode 100644 index 00000000..547183bd --- /dev/null +++ b/src/ext/Bal/wixstdba/precomp.h @@ -0,0 +1,58 @@ +#pragma once +// 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. + + +#include + +#pragma warning(push) +#pragma warning(disable:4458) // declaration of 'xxx' hides class member +#include +#pragma warning(pop) + +#include +#include +#include +#include +#include +#include +#include + +#include "dutil.h" +#include "apputil.h" +#include "memutil.h" +#include "dictutil.h" +#include "dirutil.h" +#include "fileutil.h" +#include "locutil.h" +#include "logutil.h" +#include "pathutil.h" +#include "resrutil.h" +#include "shelutil.h" +#include "strutil.h" +#include "thmutil.h" +#include "verutil.h" +#include "uriutil.h" +#include "xmlutil.h" + +#include "BootstrapperEngine.h" +#include "BootstrapperApplication.h" +#include "IBootstrapperEngine.h" +#include "IBootstrapperApplication.h" + +#include "balutil.h" +#include "balinfo.h" +#include "balcondition.h" + +#include "BAFunctions.h" + +#include "wixstdba.messages.h" + +HRESULT CreateBootstrapperApplication( + __in HMODULE hModule, + __in BOOL fPrereq, + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults, + __out IBootstrapperApplication** ppApplication + ); diff --git a/src/ext/Bal/wixstdba/resource.h b/src/ext/Bal/wixstdba/resource.h new file mode 100644 index 00000000..149a8ff4 --- /dev/null +++ b/src/ext/Bal/wixstdba/resource.h @@ -0,0 +1,15 @@ +// 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. + +#define IDC_STATIC -1 + + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1003 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/src/ext/Bal/wixstdba/wixstdba.cpp b/src/ext/Bal/wixstdba/wixstdba.cpp new file mode 100644 index 00000000..a96f1738 --- /dev/null +++ b/src/ext/Bal/wixstdba/wixstdba.cpp @@ -0,0 +1,144 @@ +// 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. + +#include "precomp.h" + +static HINSTANCE vhInstance = NULL; +static IBootstrapperApplication* vpApplication = NULL; + +static void CALLBACK WixstdbaTraceError( + __in_z LPCSTR szFile, + __in int iLine, + __in REPORT_LEVEL rl, + __in UINT source, + __in HRESULT hrError, + __in_z __format_string LPCSTR szFormat, + __in va_list args + ); + +extern "C" BOOL WINAPI DllMain( + IN HINSTANCE hInstance, + IN DWORD dwReason, + IN LPVOID /* pvReserved */ + ) +{ + switch(dwReason) + { + case DLL_PROCESS_ATTACH: + ::DisableThreadLibraryCalls(hInstance); + vhInstance = hInstance; + break; + + case DLL_PROCESS_DETACH: + vhInstance = NULL; + break; + } + + return TRUE; +} + + +extern "C" HRESULT WINAPI BootstrapperApplicationCreate( + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + IBootstrapperEngine* pEngine = NULL; + + DutilInitialize(&WixstdbaTraceError); + + hr = BalInitializeFromCreateArgs(pArgs, &pEngine); + ExitOnFailure(hr, "Failed to initialize Bal."); + + hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults, &vpApplication); + BalExitOnFailure(hr, "Failed to create bootstrapper application interface."); + +LExit: + ReleaseObject(pEngine); + + return hr; +} + + +extern "C" void WINAPI BootstrapperApplicationDestroy() +{ + ReleaseNullObject(vpApplication); + BalUninitialize(); + DutilUninitialize(); +} + + +extern "C" HRESULT WINAPI DncPrereqBootstrapperApplicationCreate( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + + DutilInitialize(&WixstdbaTraceError); + + BalInitialize(pEngine); + + hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication); + BalExitOnFailure(hr, "Failed to create .NET Core prerequisite bootstrapper application interface."); + +LExit: + return hr; +} + + +extern "C" void WINAPI DncPrereqBootstrapperApplicationDestroy() +{ + ReleaseNullObject(vpApplication); + BalUninitialize(); + DutilUninitialize(); +} + + +extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate( + __in HRESULT hrHostInitialization, + __in IBootstrapperEngine* pEngine, + __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, + __inout BOOTSTRAPPER_CREATE_RESULTS* pResults + ) +{ + HRESULT hr = S_OK; + + DutilInitialize(&WixstdbaTraceError); + + BalInitialize(pEngine); + + hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication); + BalExitOnFailure(hr, "Failed to create managed prerequisite bootstrapper application interface."); + +LExit: + return hr; +} + + +extern "C" void WINAPI MbaPrereqBootstrapperApplicationDestroy() +{ + ReleaseNullObject(vpApplication); + BalUninitialize(); + DutilUninitialize(); +} + +static void CALLBACK WixstdbaTraceError( + __in_z LPCSTR /*szFile*/, + __in int /*iLine*/, + __in REPORT_LEVEL /*rl*/, + __in UINT source, + __in HRESULT hrError, + __in_z __format_string LPCSTR szFormat, + __in va_list args + ) +{ + // BalLogError currently uses the Exit... macros, + // so if expanding the scope need to ensure this doesn't get called recursively. + if (DUTIL_SOURCE_THMUTIL == source) + { + BalLogErrorArgs(hrError, szFormat, args); + } +} diff --git a/src/ext/Bal/wixstdba/wixstdba.def b/src/ext/Bal/wixstdba/wixstdba.def new file mode 100644 index 00000000..ba9980d3 --- /dev/null +++ b/src/ext/Bal/wixstdba/wixstdba.def @@ -0,0 +1,10 @@ +; 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. + + +EXPORTS + BootstrapperApplicationCreate + BootstrapperApplicationDestroy + DncPrereqBootstrapperApplicationCreate + DncPrereqBootstrapperApplicationDestroy + MbaPrereqBootstrapperApplicationCreate + MbaPrereqBootstrapperApplicationDestroy diff --git a/src/ext/Bal/wixstdba/wixstdba.mc b/src/ext/Bal/wixstdba/wixstdba.mc new file mode 100644 index 00000000..688b1da1 --- /dev/null +++ b/src/ext/Bal/wixstdba/wixstdba.mc @@ -0,0 +1,73 @@ +; // 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. + + +MessageIdTypedef=DWORD + +LanguageNames=(English=0x409:MSG00409) + + +; // message definitions + +; // MessageId=# +; // Severity=Success +; // SymbolicName=MSG_SUCCESS +; // Language=English +; // Success %1. +; // . +; +; // MessageId=# +; // Severity=Warning +; // SymbolicName=MSG_WARNING +; // Language=English +; // Warning %1. +; // . +; +; // MessageId=# +; // Severity=Error +; // SymbolicName=MSG_ERROR +; // Language=English +; // Error %1. +; // . + +MessageId=1 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE +Language=English +WIXSTDBA: Planned forward compatible bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! +. + +MessageId=2 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_PACKAGE +Language=English +WIXSTDBA: Planned package: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! +. + +MessageId=3 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE +Language=English +WIXSTDBA: Planned related bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! +. + +MessageId=5 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE +Language=English +WIXSTDBA: Planned target MSI package: %1!ls!, productCode: %2!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs! +. + +MessageId=6 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_MSI_FEATURE +Language=English +WIXSTDBA: Planned MSI feature: %2!ls! for %1!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs! +. + +MessageId=7 +Severity=Success +SymbolicName=MSG_WIXSTDBA_PLANNED_MSI_PACKAGE +Language=English +WIXSTDBA: Planned MSI package: %1!ls!, wixstdba requested: actionMsiProperty=%2!d!;uiLevel=%3!d!;disableExternalUiHandler=%4!hs!, bafunctions requested: actionMsiProperty=%5!d!;uiLevel=%6!d!;disableExternalUiHandler=%7!hs! +. + diff --git a/src/ext/Bal/wixstdba/wixstdba.vcxproj b/src/ext/Bal/wixstdba/wixstdba.vcxproj new file mode 100644 index 00000000..06b1c8d8 --- /dev/null +++ b/src/ext/Bal/wixstdba/wixstdba.vcxproj @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + Debug + ARM64 + + + Release + ARM64 + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} + DynamicLibrary + v142 + Unicode + WixStdBA + wixstdba.def + + + + + + + comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;wixstdba.res + + + + + Create + + + + + + + + + + + + + + + + + Compiling message file... + mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z wixstdba.messages "$(InputDir)wixstdba.mc" +rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" + $(IntDir)wixstdba.messages.h;$(IntDir)wixstdba.messages.rc + + + + + + + + + + + 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/ext/global.json b/src/ext/global.json new file mode 100644 index 00000000..697f5687 --- /dev/null +++ b/src/ext/global.json @@ -0,0 +1,8 @@ +{ + "msbuild-sdks": { + "WixToolset.Sdk": "4.0.0-build-0213" + }, + "sdk": { + "allowPrerelease": false + } +} diff --git a/src/mbahost/mbahost.cpp b/src/mbahost/mbahost.cpp deleted file mode 100644 index 735f9f21..00000000 --- a/src/mbahost/mbahost.cpp +++ /dev/null @@ -1,649 +0,0 @@ -// 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. - -#include "precomp.h" -#include // includes the generated assembly name macros. - -static const DWORD NET452_RELEASE = 379893; - -using namespace mscorlib; - -extern "C" typedef HRESULT (WINAPI *PFN_CORBINDTOCURRENTRUNTIME)( - __in LPCWSTR pwszFileName, - __in REFCLSID rclsid, - __in REFIID riid, - __out LPVOID *ppv - ); - -extern "C" typedef HRESULT(WINAPI *PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE)( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ); - -static HINSTANCE vhInstance = NULL; -static ICorRuntimeHost *vpCLRHost = NULL; -static _AppDomain *vpAppDomain = NULL; -static HMODULE vhMbapreqModule = NULL; - - -// internal function declarations - -static HRESULT GetAppDomain( - __out _AppDomain** ppAppDomain - ); -static HRESULT GetAppBase( - __out LPWSTR* psczAppBase - ); -static HRESULT CheckSupportedFrameworks( - __in LPCWSTR wzConfigPath - ); -static HRESULT UpdateSupportedRuntime( - __in IXMLDOMDocument* pixdManifest, - __in IXMLDOMNode* pixnSupportedFramework, - __out BOOL* pfUpdatedManifest - ); -static HRESULT GetCLRHost( - __in LPCWSTR wzConfigPath, - __out ICorRuntimeHost** ppCLRHost - ); -static HRESULT CreateManagedBootstrapperApplication( - __in _AppDomain* pAppDomain, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ); -static HRESULT CreateManagedBootstrapperApplicationFactory( - __in _AppDomain* pAppDomain, - __out IBootstrapperApplicationFactory** ppAppFactory - ); -static HRESULT CreatePrerequisiteBA( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ); -static HRESULT VerifyNET4RuntimeIsSupported( - ); - - -// function definitions - -extern "C" BOOL WINAPI DllMain( - IN HINSTANCE hInstance, - IN DWORD dwReason, - IN LPVOID /* pvReserved */ - ) -{ - switch (dwReason) - { - case DLL_PROCESS_ATTACH: - ::DisableThreadLibraryCalls(hInstance); - vhInstance = hInstance; - break; - - case DLL_PROCESS_DETACH: - vhInstance = NULL; - break; - } - - return TRUE; -} - -// Note: This function assumes that COM was already initialized on the thread. -extern "C" HRESULT WINAPI BootstrapperApplicationCreate( - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - HRESULT hrHostInitialization = S_OK; - IBootstrapperEngine* pEngine = NULL; - - hr = BalInitializeFromCreateArgs(pArgs, &pEngine); - ExitOnFailure(hr, "Failed to initialize Bal."); - - hr = GetAppDomain(&vpAppDomain); - if (SUCCEEDED(hr)) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading managed bootstrapper application."); - - hr = CreateManagedBootstrapperApplication(vpAppDomain, pArgs, pResults); - BalExitOnFailure(hr, "Failed to create the managed bootstrapper application."); - } - else // fallback to the prerequisite BA. - { - if (E_MBAHOST_NET452_ON_WIN7RTM == hr) - { - BalLogError(hr, "The Burn engine cannot run with an MBA under the .NET 4 CLR on Windows 7 RTM with .NET 4.5.2 (or greater) installed."); - hrHostInitialization = hr; - } - else - { - hrHostInitialization = S_OK; - } - - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Loading prerequisite bootstrapper application because managed host could not be loaded, error: 0x%08x.", hr); - - hr = CreatePrerequisiteBA(hrHostInitialization, pEngine, pArgs, pResults); - BalExitOnFailure(hr, "Failed to create the pre-requisite bootstrapper application."); - } - -LExit: - ReleaseNullObject(pEngine); - - return hr; -} - -extern "C" void WINAPI BootstrapperApplicationDestroy() -{ - if (vpAppDomain) - { - HRESULT hr = vpCLRHost->UnloadDomain(vpAppDomain); - if (FAILED(hr)) - { - BalLogError(hr, "Failed to unload app domain."); - } - - vpAppDomain->Release(); - } - - if (vpCLRHost) - { - vpCLRHost->Stop(); - vpCLRHost->Release(); - } - - if (vhMbapreqModule) - { - PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = reinterpret_cast(::GetProcAddress(vhMbapreqModule, "MbaPrereqBootstrapperApplicationDestroy")); - if (pfnDestroy) - { - (*pfnDestroy)(); - } - - ::FreeLibrary(vhMbapreqModule); - vhMbapreqModule = NULL; - } - - BalUninitialize(); -} - -// Gets the custom AppDomain for loading managed BA. -static HRESULT GetAppDomain( - __out _AppDomain **ppAppDomain - ) -{ - HRESULT hr = S_OK; - ICorRuntimeHost *pCLRHost = NULL; - IUnknown *pUnk = NULL; - LPWSTR sczAppBase = NULL; - LPWSTR sczConfigPath = NULL; - IAppDomainSetup *pAppDomainSetup; - BSTR bstrAppBase = NULL; - BSTR bstrConfigPath = NULL; - - hr = GetAppBase(&sczAppBase); - ExitOnFailure(hr, "Failed to get the host base path."); - - hr = PathConcat(sczAppBase, MBA_CONFIG_FILE_NAME, &sczConfigPath); - ExitOnFailure(hr, "Failed to get the full path to the application configuration file."); - - // Check that the supported framework is installed. - hr = CheckSupportedFrameworks(sczConfigPath); - ExitOnFailure(hr, "Failed to find supported framework."); - - // Load the CLR. - hr = GetCLRHost(sczConfigPath, &pCLRHost); - ExitOnFailure(hr, "Failed to create the CLR host."); - - hr = pCLRHost->Start(); - ExitOnRootFailure(hr, "Failed to start the CLR host."); - - // Create the setup information for a new AppDomain to set the app base and config. - hr = pCLRHost->CreateDomainSetup(&pUnk); - ExitOnRootFailure(hr, "Failed to create the AppDomainSetup object."); - - hr = pUnk->QueryInterface(__uuidof(IAppDomainSetup), reinterpret_cast(&pAppDomainSetup)); - ExitOnRootFailure(hr, "Failed to query for the IAppDomainSetup interface."); - ReleaseNullObject(pUnk); - - // Set properties on the AppDomainSetup object. - bstrAppBase = ::SysAllocString(sczAppBase); - ExitOnNull(bstrAppBase, hr, E_OUTOFMEMORY, "Failed to allocate the application base path for the AppDomainSetup."); - - hr = pAppDomainSetup->put_ApplicationBase(bstrAppBase); - ExitOnRootFailure(hr, "Failed to set the application base path for the AppDomainSetup."); - - bstrConfigPath = ::SysAllocString(sczConfigPath); - ExitOnNull(bstrConfigPath, hr, E_OUTOFMEMORY, "Failed to allocate the application configuration file for the AppDomainSetup."); - - hr = pAppDomainSetup->put_ConfigurationFile(bstrConfigPath); - ExitOnRootFailure(hr, "Failed to set the configuration file path for the AppDomainSetup."); - - // Create the AppDomain to load the factory type. - hr = pCLRHost->CreateDomainEx(L"MBA", pAppDomainSetup, NULL, &pUnk); - ExitOnRootFailure(hr, "Failed to create the MBA AppDomain."); - - hr = pUnk->QueryInterface(__uuidof(_AppDomain), reinterpret_cast(ppAppDomain)); - ExitOnRootFailure(hr, "Failed to query for the _AppDomain interface."); - -LExit: - ReleaseBSTR(bstrConfigPath); - ReleaseBSTR(bstrAppBase); - ReleaseStr(sczConfigPath); - ReleaseStr(sczAppBase); - ReleaseNullObject(pUnk); - ReleaseNullObject(pCLRHost); - - return hr; -} - -static HRESULT GetAppBase( - __out LPWSTR *psczAppBase - ) -{ - HRESULT hr = S_OK; - LPWSTR sczFullPath = NULL; - - hr = PathForCurrentProcess(&sczFullPath, vhInstance); - ExitOnFailure(hr, "Failed to get the full host path."); - - hr = PathGetDirectory(sczFullPath, psczAppBase); - ExitOnFailure(hr, "Failed to get the directory of the full process path."); - -LExit: - ReleaseStr(sczFullPath); - - return hr; -} - -// Checks whether at least one of required supported frameworks is installed via the NETFX registry keys. -static HRESULT CheckSupportedFrameworks( - __in LPCWSTR wzConfigPath - ) -{ - HRESULT hr = S_OK; - IXMLDOMDocument* pixdManifest = NULL; - IXMLDOMNodeList* pNodeList = NULL; - IXMLDOMNode* pNode = NULL; - DWORD cSupportedFrameworks = 0; - LPWSTR sczSupportedFrameworkVersion = NULL; - LPWSTR sczFrameworkRegistryKey = NULL; - HKEY hkFramework = NULL; - DWORD dwFrameworkInstalled = 0; - BOOL fUpdatedManifest = FALSE; - - hr = XmlInitialize(); - ExitOnFailure(hr, "Failed to initialize XML."); - - hr = XmlLoadDocumentFromFile(wzConfigPath, &pixdManifest); - ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); - - hr = XmlSelectNodes(pixdManifest, L"/configuration/wix.bootstrapper/host/supportedFramework", &pNodeList); - ExitOnFailure(hr, "Failed to select all supportedFramework elements."); - - hr = pNodeList->get_length(reinterpret_cast(&cSupportedFrameworks)); - ExitOnFailure(hr, "Failed to get the supported framework count."); - - if (cSupportedFrameworks) - { - while (S_OK == (hr = XmlNextElement(pNodeList, &pNode, NULL))) - { - hr = XmlGetAttributeEx(pNode, L"version", &sczSupportedFrameworkVersion); - ExitOnFailure(hr, "Failed to get supportedFramework/@version."); - - hr = StrAllocFormatted(&sczFrameworkRegistryKey, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\%ls", sczSupportedFrameworkVersion); - ExitOnFailure(hr, "Failed to allocate path to supported framework Install registry key."); - - hr = RegOpen(HKEY_LOCAL_MACHINE, sczFrameworkRegistryKey, KEY_READ, &hkFramework); - if (SUCCEEDED(hr)) - { - hr = RegReadNumber(hkFramework, L"Install", &dwFrameworkInstalled); - if (dwFrameworkInstalled) - { - hr = S_OK; - break; - } - } - - ReleaseNullObject(pNode); - } - - // If we looped through all the supported frameworks but didn't find anything, ensure we return a failure. - if (S_FALSE == hr) - { - hr = E_NOTFOUND; - ExitOnRootFailure(hr, "Failed to find a supported framework."); - } - - hr = UpdateSupportedRuntime(pixdManifest, pNode, &fUpdatedManifest); - ExitOnFailure(hr, "Failed to update supportedRuntime."); - } - // else no supported frameworks specified, so the startup/supportedRuntime must be enough. - - if (fUpdatedManifest) - { - hr = XmlSaveDocument(pixdManifest, wzConfigPath); - ExitOnFailure(hr, "Failed to save updated manifest over config file: %ls", wzConfigPath); - } - -LExit: - ReleaseRegKey(hkFramework); - ReleaseStr(sczFrameworkRegistryKey); - ReleaseStr(sczSupportedFrameworkVersion); - ReleaseObject(pNode); - ReleaseObject(pNodeList); - ReleaseObject(pixdManifest); - - XmlUninitialize(); - - return hr; -} - -// Fixes the supportedRuntime element if necessary. -static HRESULT UpdateSupportedRuntime( - __in IXMLDOMDocument* pixdManifest, - __in IXMLDOMNode* pixnSupportedFramework, - __out BOOL* pfUpdatedManifest - ) -{ - HRESULT hr = S_OK; - LPWSTR sczSupportedRuntimeVersion = NULL; - IXMLDOMNode* pixnStartup = NULL; - IXMLDOMNode* pixnSupportedRuntime = NULL; - - *pfUpdatedManifest = FALSE; - - // If the runtime version attribute is not specified, don't update the manifest. - hr = XmlGetAttributeEx(pixnSupportedFramework, L"runtimeVersion", &sczSupportedRuntimeVersion); - if (E_NOTFOUND == hr) - { - ExitFunction1(hr = S_OK); - } - ExitOnFailure(hr, "Failed to get supportedFramework/@runtimeVersion."); - - // Get the startup element. Fail if we can't find it since it'll be necessary to load the - // correct runtime. - hr = XmlSelectSingleNode(pixdManifest, L"/configuration/startup", &pixnStartup); - ExitOnFailure(hr, "Failed to get startup element."); - - if (S_FALSE == hr) - { - hr = E_NOTFOUND; - ExitOnRootFailure(hr, "Failed to find startup element in bootstrapper application config."); - } - - // Remove any pre-existing supported runtimes because they'll just get in the way and create our new one. - hr = XmlRemoveChildren(pixnStartup, L"supportedRuntime"); - ExitOnFailure(hr, "Failed to remove pre-existing supportedRuntime elements."); - - hr = XmlCreateChild(pixnStartup, L"supportedRuntime", &pixnSupportedRuntime); - ExitOnFailure(hr, "Failed to create supportedRuntime element."); - - hr = XmlSetAttribute(pixnSupportedRuntime, L"version", sczSupportedRuntimeVersion); - ExitOnFailure(hr, "Failed to set supportedRuntime/@version to '%ls'.", sczSupportedRuntimeVersion); - - *pfUpdatedManifest = TRUE; - -LExit: - ReleaseObject(pixnSupportedRuntime); - ReleaseObject(pixnStartup); - ReleaseStr(sczSupportedRuntimeVersion); - - return hr; -} - -// Gets the CLR host and caches it. -static HRESULT GetCLRHost( - __in LPCWSTR wzConfigPath, - __out ICorRuntimeHost **ppCLRHost - ) -{ - HRESULT hr = S_OK; - UINT uiMode = 0; - HMODULE hModule = NULL; - BOOL fFallbackToCorBindToCurrentRuntime = TRUE; - CLRCreateInstanceFnPtr pfnCLRCreateInstance = NULL; - ICLRMetaHostPolicy* pCLRMetaHostPolicy = NULL; - IStream* pCfgStream = NULL; - LPWSTR pwzVersion = NULL; - DWORD cchVersion = 0; - DWORD dwConfigFlags = 0; - ICLRRuntimeInfo* pCLRRuntimeInfo = NULL; - PFN_CORBINDTOCURRENTRUNTIME pfnCorBindToCurrentRuntime = NULL; - - // Always set the error mode because we will always restore it below. - uiMode = ::SetErrorMode(0); - - // Cache the CLR host to be shutdown later. This can occur on a different thread. - if (!vpCLRHost) - { - // Disable message boxes from being displayed on error and blocking execution. - ::SetErrorMode(uiMode | SEM_FAILCRITICALERRORS); - - hr = LoadSystemLibrary(L"mscoree.dll", &hModule); - ExitOnFailure(hr, "Failed to load mscoree.dll"); - - pfnCLRCreateInstance = reinterpret_cast(::GetProcAddress(hModule, "CLRCreateInstance")); - - if (pfnCLRCreateInstance) - { - hr = pfnCLRCreateInstance(CLSID_CLRMetaHostPolicy, IID_ICLRMetaHostPolicy, reinterpret_cast(&pCLRMetaHostPolicy)); - if (E_NOTIMPL != hr) - { - ExitOnRootFailure(hr, "Failed to create instance of ICLRMetaHostPolicy."); - - fFallbackToCorBindToCurrentRuntime = FALSE; - } - } - - if (fFallbackToCorBindToCurrentRuntime) - { - pfnCorBindToCurrentRuntime = reinterpret_cast(::GetProcAddress(hModule, "CorBindToCurrentRuntime")); - ExitOnNullWithLastError(pfnCorBindToCurrentRuntime, hr, "Failed to get procedure address for CorBindToCurrentRuntime."); - - hr = pfnCorBindToCurrentRuntime(wzConfigPath, CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); - ExitOnRootFailure(hr, "Failed to create the CLR host using the application configuration file path."); - } - else - { - - hr = SHCreateStreamOnFileEx(wzConfigPath, STGM_READ | STGM_SHARE_DENY_WRITE, 0, FALSE, NULL, &pCfgStream); - ExitOnFailure(hr, "Failed to load bootstrapper config file from path: %ls", wzConfigPath); - - hr = pCLRMetaHostPolicy->GetRequestedRuntime(METAHOST_POLICY_HIGHCOMPAT, NULL, pCfgStream, NULL, &cchVersion, NULL, NULL, &dwConfigFlags, IID_ICLRRuntimeInfo, reinterpret_cast(&pCLRRuntimeInfo)); - ExitOnRootFailure(hr, "Failed to get the CLR runtime info using the application configuration file path."); - - // .NET 4 RTM had a bug where it wouldn't set pcchVersion if pwzVersion was NULL. - if (!cchVersion) - { - hr = pCLRRuntimeInfo->GetVersionString(NULL, &cchVersion); - if (HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER) != hr) - { - ExitOnFailure(hr, "Failed to get the length of the CLR version string."); - } - } - - hr = StrAlloc(&pwzVersion, cchVersion); - ExitOnFailure(hr, "Failed to allocate the CLR version string."); - - hr = pCLRRuntimeInfo->GetVersionString(pwzVersion, &cchVersion); - ExitOnFailure(hr, "Failed to get the CLR version string."); - - if (CSTR_EQUAL == CompareString(LOCALE_NEUTRAL, 0, L"v4.0.30319", -1, pwzVersion, cchVersion)) - { - hr = VerifyNET4RuntimeIsSupported(); - ExitOnFailure(hr, "Found unsupported .NET 4 Runtime."); - } - - if (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_TRUE == (METAHOST_CONFIG_FLAGS_LEGACY_V2_ACTIVATION_POLICY_MASK & dwConfigFlags)) - { - hr = pCLRRuntimeInfo->BindAsLegacyV2Runtime(); - ExitOnRootFailure(hr, "Failed to bind as legacy V2 runtime."); - } - - hr = pCLRRuntimeInfo->GetInterface(CLSID_CorRuntimeHost, IID_ICorRuntimeHost, reinterpret_cast(&vpCLRHost)); - ExitOnRootFailure(hr, "Failed to get instance of ICorRuntimeHost."); - - // TODO: use ICLRRuntimeHost instead of ICorRuntimeHost on .NET 4 since the former is faster and the latter is deprecated - //hr = pCLRRuntimeInfo->GetInterface(CLSID_CLRRuntimeHost, IID_ICLRRuntimeHost, reinterpret_cast(&pCLRRuntimeHost)); - //ExitOnRootFailure(hr, "Failed to get instance of ICLRRuntimeHost."); - } - } - - vpCLRHost->AddRef(); - *ppCLRHost = vpCLRHost; - -LExit: - ReleaseStr(pwzVersion); - ReleaseNullObject(pCLRRuntimeInfo); - ReleaseNullObject(pCfgStream); - ReleaseNullObject(pCLRMetaHostPolicy); - - // Unload the module so it's not in use when we install .NET. - if (FAILED(hr)) - { - ::FreeLibrary(hModule); - } - - ::SetErrorMode(uiMode); // restore the previous error mode. - - return hr; -} - -// Creates the bootstrapper app and returns it for the engine. -static HRESULT CreateManagedBootstrapperApplication( - __in _AppDomain* pAppDomain, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - IBootstrapperApplicationFactory* pAppFactory = NULL; - - hr = CreateManagedBootstrapperApplicationFactory(pAppDomain, &pAppFactory); - ExitOnFailure(hr, "Failed to create the factory to create the bootstrapper application."); - - hr = pAppFactory->Create(pArgs, pResults); - ExitOnFailure(hr, "Failed to create the bootstrapper application."); - -LExit: - ReleaseNullObject(pAppFactory); - - return hr; -} - -// Creates the app factory to create the managed app in the default AppDomain. -static HRESULT CreateManagedBootstrapperApplicationFactory( - __in _AppDomain* pAppDomain, - __out IBootstrapperApplicationFactory** ppAppFactory - ) -{ - HRESULT hr = S_OK; - BSTR bstrAssemblyName = NULL; - BSTR bstrTypeName = NULL; - _ObjectHandle* pObj = NULL; - VARIANT vtBAFactory; - - ::VariantInit(&vtBAFactory); - - bstrAssemblyName = ::SysAllocString(MBA_ASSEMBLY_FULL_NAME); - ExitOnNull(bstrAssemblyName, hr, E_OUTOFMEMORY, "Failed to allocate the full assembly name for the bootstrapper application factory."); - - bstrTypeName = ::SysAllocString(MBA_ENTRY_TYPE); - ExitOnNull(bstrTypeName, hr, E_OUTOFMEMORY, "Failed to allocate the full type name for the BA factory."); - - hr = pAppDomain->CreateInstance(bstrAssemblyName, bstrTypeName, &pObj); - ExitOnRootFailure(hr, "Failed to create the BA factory object."); - - hr = pObj->Unwrap(&vtBAFactory); - ExitOnRootFailure(hr, "Failed to unwrap the BA factory object into the host domain."); - ExitOnNull(vtBAFactory.punkVal, hr, E_UNEXPECTED, "The variant did not contain the expected IUnknown pointer."); - - hr = vtBAFactory.punkVal->QueryInterface(__uuidof(IBootstrapperApplicationFactory), reinterpret_cast(ppAppFactory)); - ExitOnRootFailure(hr, "Failed to query for the bootstrapper app factory interface."); - -LExit: - ReleaseVariant(vtBAFactory); - ReleaseNullObject(pObj); - ReleaseBSTR(bstrTypeName); - ReleaseBSTR(bstrAssemblyName); - - return hr; -} - -static HRESULT CreatePrerequisiteBA( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - LPWSTR sczMbapreqPath = NULL; - HMODULE hModule = NULL; - - hr = PathRelativeToModule(&sczMbapreqPath, L"mbapreq.dll", vhInstance); - ExitOnFailure(hr, "Failed to get path to pre-requisite BA."); - - hModule = ::LoadLibraryW(sczMbapreqPath); - ExitOnNullWithLastError(hModule, hr, "Failed to load pre-requisite BA DLL."); - - PFN_MBAPREQ_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = reinterpret_cast(::GetProcAddress(hModule, "MbaPrereqBootstrapperApplicationCreate")); - ExitOnNullWithLastError(pfnCreate, hr, "Failed to get MbaPrereqBootstrapperApplicationCreate entry-point from: %ls", sczMbapreqPath); - - hr = pfnCreate(hrHostInitialization, pEngine, pArgs, pResults); - ExitOnFailure(hr, "Failed to create prequisite bootstrapper app."); - - vhMbapreqModule = hModule; - hModule = NULL; - -LExit: - if (hModule) - { - ::FreeLibrary(hModule); - } - ReleaseStr(sczMbapreqPath); - - return hr; -} - -static HRESULT VerifyNET4RuntimeIsSupported( - ) -{ - HRESULT hr = S_OK; - OS_VERSION osv = OS_VERSION_UNKNOWN; - DWORD dwServicePack = 0; - HKEY hKey = NULL; - DWORD er = ERROR_SUCCESS; - DWORD dwRelease = 0; - DWORD cchRelease = sizeof(dwRelease); - - OsGetVersion(&osv, &dwServicePack); - if (OS_VERSION_WIN7 == osv && 0 == dwServicePack) - { - hr = RegOpen(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\NET Framework Setup\\NDP\\v4\\Full", KEY_QUERY_VALUE, &hKey); - if (E_FILENOTFOUND == hr) - { - ExitFunction1(hr = S_OK); - } - ExitOnFailure(hr, "Failed to open registry key for .NET 4."); - - er = ::RegQueryValueExW(hKey, L"Release", NULL, NULL, reinterpret_cast(&dwRelease), &cchRelease); - if (ERROR_FILE_NOT_FOUND == er) - { - ExitFunction1(hr = S_OK); - } - ExitOnWin32Error(er, hr, "Failed to get Release value."); - - if (NET452_RELEASE <= dwRelease) - { - hr = E_MBAHOST_NET452_ON_WIN7RTM; - } - } - -LExit: - ReleaseRegKey(hKey); - - return hr; -} diff --git a/src/mbahost/mbahost.def b/src/mbahost/mbahost.def deleted file mode 100644 index 4488df94..00000000 --- a/src/mbahost/mbahost.def +++ /dev/null @@ -1,6 +0,0 @@ -; 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. - - -EXPORTS - BootstrapperApplicationCreate - BootstrapperApplicationDestroy diff --git a/src/mbahost/mbahost.vcxproj b/src/mbahost/mbahost.vcxproj deleted file mode 100644 index 6457b4e0..00000000 --- a/src/mbahost/mbahost.vcxproj +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - {12C87C77-3547-44F8-8134-29BC915CB19D} - DynamicLibrary - v142 - Unicode - mbahost - mbahost.def - - - - - - - shlwapi.lib - - - - - - Create - - - - - - - - - - - - - - - - $(BaseOutputPath)obj;%(AdditionalIncludeDirectories) - - - - - - {f2ba1935-70fa-4156-b161-fd03850b4faa} - false - true - - - - - - - - - - - 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/mbahost/packages.config b/src/mbahost/packages.config deleted file mode 100644 index 071284ac..00000000 --- a/src/mbahost/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/mbahost/precomp.cpp b/src/mbahost/precomp.cpp deleted file mode 100644 index 37664a1c..00000000 --- a/src/mbahost/precomp.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// 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. - -#include "precomp.h" diff --git a/src/mbahost/precomp.h b/src/mbahost/precomp.h deleted file mode 100644 index d29a23f3..00000000 --- a/src/mbahost/precomp.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once -// 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. - - -#include -#include -#include -#include - -#import raw_interfaces_only rename("ReportEvent", "mscorlib_ReportEvent") - -#include -#include -#include -#include -#include -#include - -#include "BootstrapperEngine.h" -#include "BootstrapperApplication.h" -#include "IBootstrapperEngine.h" -#include "IBootstrapperApplication.h" -#include "IBootstrapperApplicationFactory.h" - -#include "balutil.h" diff --git a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs b/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs deleted file mode 100644 index 2ff57c55..00000000 --- a/src/test/WixToolsetTest.Bal/BalExtensionFixture.cs +++ /dev/null @@ -1,133 +0,0 @@ -// 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. - -namespace WixToolsetTest.Bal -{ - using System.IO; - using System.Linq; - using System.Xml; - using WixBuildTools.TestSupport; - using WixToolset.Core.TestPackage; - using Xunit; - - public class BalExtensionFixture - { - [Fact] - public void CanBuildUsingDisplayInternalUICondition() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "DisplayInternalUIConditionBundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-bindpath", Path.Combine(bundleSourceFolder, "data"), - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var balPackageInfos = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixBalPackageInfo"); - var balPackageInfo = (XmlNode)Assert.Single(balPackageInfos); - Assert.Equal("", balPackageInfo.GetTestXml()); - - Assert.True(File.Exists(Path.Combine(baFolderPath, "thm.wxl"))); - } - } - - [Fact] - public void CanBuildUsingOverridable() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\Overridable"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - var baFolderPath = Path.Combine(baseFolder, "ba"); - var extractFolderPath = Path.Combine(baseFolder, "extract"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - - var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFile, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var balOverridableVariables = extractResult.SelectBADataNodes("/ba:BootstrapperApplicationData/ba:WixStdbaOverridableVariable"); - var balOverridableVariable = (XmlNode)Assert.Single(balOverridableVariables); - Assert.Equal("", balOverridableVariable.GetTestXml()); - } - } - - [Fact] - public void CanBuildUsingWixStdBa() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\WixStdBa"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", bundleFile, - }); - compileResult.AssertSuccess(); - - Assert.True(File.Exists(bundleFile)); - } - } - - [Fact] - public void CantBuildUsingMBAWithNoPrereqs() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = Path.Combine(baseFolder, "bin", "test.exe"); - var bundleSourceFolder = TestData.Get(@"TestData\MBA"); - var intermediateFolder = Path.Combine(baseFolder, "obj"); - - var compileResult = WixRunner.Execute(new[] - { - "build", - Path.Combine(bundleSourceFolder, "Bundle.wxs"), - "-ext", TestData.Get(@"WixToolset.Bal.wixext.dll"), - "-intermediateFolder", intermediateFolder, - "-o", bundleFile, - }); - Assert.Equal(6802, compileResult.ExitCode); - Assert.Equal("There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups.", compileResult.Messages[0].ToString()); - - Assert.False(File.Exists(bundleFile)); - Assert.False(File.Exists(Path.Combine(intermediateFolder, "test.exe"))); - } - } - } -} diff --git a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs deleted file mode 100644 index ba1aefba..00000000 --- a/src/test/WixToolsetTest.Bal/TestData/MBA/Bundle.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs deleted file mode 100644 index 91380c69..00000000 --- a/src/test/WixToolsetTest.Bal/TestData/Overridable/Bundle.wxs +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs deleted file mode 100644 index c17b53ff..00000000 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Bundle.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi deleted file mode 100644 index 94aacd1a..00000000 Binary files a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/Data/test.msi and /dev/null differ diff --git a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs b/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs deleted file mode 100644 index f08cfe6a..00000000 --- a/src/test/WixToolsetTest.Bal/TestData/WixStdBa/DisplayInternalUIConditionBundle.wxs +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj deleted file mode 100644 index c9ab4219..00000000 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - netcoreapp3.1 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject deleted file mode 100644 index 7b5b2139..00000000 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.v3.ncrunchproject +++ /dev/null @@ -1,5 +0,0 @@ - - - True - - \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs deleted file mode 100644 index af5f2543..00000000 --- a/src/test/WixToolsetTest.ManagedHost/DncHostFixture.cs +++ /dev/null @@ -1,209 +0,0 @@ -// 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. - -namespace WixToolsetTest.ManagedHost -{ - using System.IO; - using WixBuildTools.TestSupport; - using WixToolset.Core.TestPackage; - using Xunit; - - public class DncHostFixture - { - static readonly string bundleBasePath = TestData.Get("..", "examples"); - - [Fact] - public void CanLoadFDDEarliestCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleFDD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("EarliestCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - } - } - - [Fact] - public void CanLoadSCDEarliestCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleSCD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("EarliestCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - } - } - - [Fact] - public void CanLoadTrimmedSCDEarliestCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleTrimmedSCD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("EarliestCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - } - } - - [Fact] - public void CanReloadSCDEarliestCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "EarliestCoreBundleSCD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunReloadEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("EarliestCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[4]); - Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]); - Assert.Equal("EarliestCoreBA", logMessages[7]); - Assert.Equal("Shutdown,Restart,0", logMessages[8]); - } - } - - [Fact] - public void CanLoadFDDLatestCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("LatestCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - } - } - - [Fact] - public void CanReloadFDDLatestCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleFDD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunReloadEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("LatestCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[4]); - Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]); - Assert.Equal("LatestCoreBA", logMessages[7]); - Assert.Equal("Shutdown,Restart,0", logMessages[8]); - } - } - - [Fact] - public void CanLoadSCDLatestCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleSCD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("LatestCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - } - } - - [Fact] - public void CanLoadTrimmedSCDLatestCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleTrimmedSCD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("LatestCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - } - } - - [Fact] - public void CanReloadSCDLatestCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "LatestCoreBundleSCD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunReloadEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("LatestCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - Assert.Equal("Loading .NET Core SCD bootstrapper application.", logMessages[4]); - Assert.Equal("Reloaded 1 time(s)", logMessages[5]); // dnchost doesn't currently support unloading - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[6]); - Assert.Equal("LatestCoreBA", logMessages[7]); - Assert.Equal("Shutdown,Restart,0", logMessages[8]); - } - } - - [Fact] - public void CanLoadFDDWPFCoreMBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "WPFCoreBundleFDD.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading .NET Core FDD bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("WPFCoreBA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - } - } - } -} diff --git a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs b/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs deleted file mode 100644 index dd37ee58..00000000 --- a/src/test/WixToolsetTest.ManagedHost/MbaHostFixture.cs +++ /dev/null @@ -1,94 +0,0 @@ -// 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. - -namespace WixToolsetTest.ManagedHost -{ - using System.IO; - using WixBuildTools.TestSupport; - using WixToolset.Core.TestPackage; - using Xunit; - - public class MbaHostFixture - { - static readonly string bundleBasePath = TestData.Get("..", "examples"); - - [Fact] - public void CanLoadFullFramework2MBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "FullFramework2Bundle.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("FullFramework2BA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - } - } - - [Fact] - public void CanLoadFullFramework4MBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "FullFramework4Bundle.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunShutdownEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("FullFramework4BA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - } - } - - [Fact] - public void CanReloadFullFramework2MBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "FullFramework2Bundle.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunReloadEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("FullFramework2BA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - Assert.Equal("Loading managed bootstrapper application.", logMessages[4]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]); - Assert.Equal("FullFramework2BA", logMessages[6]); - Assert.Equal("Shutdown,Restart,0", logMessages[7]); - } - } - - [Fact] - public void CanReloadFullFramework4MBA() - { - using (var fs = new DisposableFileSystem()) - { - var baseFolder = fs.GetFolder(); - var bundleFile = TestData.Get(bundleBasePath, "FullFramework4Bundle.exe"); - var testEngine = new TestEngine(); - - var result = testEngine.RunReloadEngine(bundleFile, baseFolder); - var logMessages = result.Output; - Assert.Equal("Loading managed bootstrapper application.", logMessages[0]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[1]); - Assert.Equal("FullFramework4BA", logMessages[2]); - Assert.Equal("Shutdown,ReloadBootstrapper,0", logMessages[3]); - Assert.Equal("Loading managed bootstrapper application.", logMessages[4]); - Assert.Equal("Creating BA thread to run asynchronously.", logMessages[5]); - Assert.Equal("FullFramework4BA", logMessages[6]); - Assert.Equal("Shutdown,Restart,0", logMessages[7]); - } - } - } -} diff --git a/src/test/WixToolsetTest.ManagedHost/README.md b/src/test/WixToolsetTest.ManagedHost/README.md deleted file mode 100644 index d7e73df2..00000000 --- a/src/test/WixToolsetTest.ManagedHost/README.md +++ /dev/null @@ -1,5 +0,0 @@ -In order to properly test dnchost and mbahost, -the managed BAs need to be published and a bundle needs to be built for each scenario. -Making this happen on every build for the solution takes too long, -so this project relies on manually running appveyor.cmd to publish everything before the tests can be run. -appveyor.cmd needs to be ran again every time changes are made in other projects. \ No newline at end of file diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs b/src/test/WixToolsetTest.ManagedHost/TestEngine.cs deleted file mode 100644 index 44538227..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestEngine.cs +++ /dev/null @@ -1,74 +0,0 @@ -// 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. - -namespace WixToolsetTest.ManagedHost -{ - using System.Collections.Generic; - using System.Diagnostics; - using System.IO; - using WixBuildTools.TestSupport; - using WixToolset.Core.TestPackage; - - public class TestEngine - { - private static readonly string TestEngineFile = TestData.Get(@"..\Win32\examples\Example.TestEngine\Example.TestEngine.exe"); - - public TestEngineResult RunReloadEngine(string bundleFilePath, string tempFolderPath) - { - return this.RunTestEngine("reload", bundleFilePath, tempFolderPath); - } - - public TestEngineResult RunShutdownEngine(string bundleFilePath, string tempFolderPath) - { - return this.RunTestEngine("shutdown", bundleFilePath, tempFolderPath); - } - - private TestEngineResult RunTestEngine(string engineMode, string bundleFilePath, string tempFolderPath) - { - var baFolderPath = Path.Combine(tempFolderPath, "ba"); - var extractFolderPath = Path.Combine(tempFolderPath, "extract"); - var extractResult = BundleExtractor.ExtractBAContainer(null, bundleFilePath, baFolderPath, extractFolderPath); - extractResult.AssertSuccess(); - - var args = new string[] { - engineMode, - '"' + bundleFilePath + '"', - '"' + extractResult.GetBAFilePath(baFolderPath) + '"', - }; - return RunProcessCaptureOutput(TestEngineFile, args); - } - - private static TestEngineResult RunProcessCaptureOutput(string executablePath, string[] arguments = null, string workingFolder = null) - { - var startInfo = new ProcessStartInfo(executablePath) - { - Arguments = string.Join(' ', arguments), - CreateNoWindow = true, - RedirectStandardError = true, - RedirectStandardOutput = true, - UseShellExecute = false, - WorkingDirectory = workingFolder, - }; - - var exitCode = 0; - var output = new List(); - - using (var process = Process.Start(startInfo)) - { - process.OutputDataReceived += (s, e) => { if (e.Data != null) { output.Add(e.Data); } }; - process.ErrorDataReceived += (s, e) => { if (e.Data != null) { output.Add(e.Data); } }; - - process.BeginErrorReadLine(); - process.BeginOutputReadLine(); - - process.WaitForExit(); - exitCode = process.ExitCode; - } - - return new TestEngineResult - { - ExitCode = exitCode, - Output = output, - }; - } - } -} diff --git a/src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs b/src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs deleted file mode 100644 index 63f6f7f5..00000000 --- a/src/test/WixToolsetTest.ManagedHost/TestEngineResult.cs +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -namespace WixToolsetTest.ManagedHost -{ - using System.Collections.Generic; - - public class TestEngineResult - { - public int ExitCode { get; set; } - public List Output { get; set; } - } -} diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj deleted file mode 100644 index 38c8926c..00000000 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - netcoreapp3.1 - - - - - - - - - - - - - - - - - - - diff --git a/src/test/examples/Directory.Build.props b/src/test/examples/Directory.Build.props deleted file mode 100644 index 3d5870a5..00000000 --- a/src/test/examples/Directory.Build.props +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/test/examples/Directory.Build.targets b/src/test/examples/Directory.Build.targets deleted file mode 100644 index 6dcf402b..00000000 --- a/src/test/examples/Directory.Build.targets +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj b/src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj deleted file mode 100644 index ba75a9ff..00000000 --- a/src/test/examples/EarliestCoreBundleFDD/EarliestCoreBundleFDD.wixproj +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs deleted file mode 100644 index d146845c..00000000 --- a/src/test/examples/EarliestCoreBundleFDD/FrameworkDependentBundle.wxs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj deleted file mode 100644 index ebeebff2..00000000 --- a/src/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - publish.Example.EarliestCoreMBA.scd - ba.xslt - - - diff --git a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs deleted file mode 100644 index 4d872317..00000000 --- a/src/test/examples/EarliestCoreBundleSCD/SelfContainedBundle.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/examples/EarliestCoreBundleSCD/ba.xslt b/src/test/examples/EarliestCoreBundleSCD/ba.xslt deleted file mode 100644 index 06b84256..00000000 --- a/src/test/examples/EarliestCoreBundleSCD/ba.xslt +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - yes - - - - diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj b/src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj deleted file mode 100644 index a6b56460..00000000 --- a/src/test/examples/EarliestCoreBundleTrimmedSCD/EarliestCoreBundleTrimmedSCD.wixproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - publish.Example.EarliestCoreMBA.trimmedscd - ba.xslt - - - diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs deleted file mode 100644 index ba7dce25..00000000 --- a/src/test/examples/EarliestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt b/src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt deleted file mode 100644 index 06b84256..00000000 --- a/src/test/examples/EarliestCoreBundleTrimmedSCD/ba.xslt +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - yes - - - - diff --git a/src/test/examples/EarliestCoreMBA/EarliestCoreBA.cs b/src/test/examples/EarliestCoreMBA/EarliestCoreBA.cs deleted file mode 100644 index c9291a7f..00000000 --- a/src/test/examples/EarliestCoreMBA/EarliestCoreBA.cs +++ /dev/null @@ -1,34 +0,0 @@ -// 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. - -namespace Example.EarliestCoreMBA -{ - using WixToolset.Mba.Core; - - public class EarliestCoreBA : BootstrapperApplication - { - public EarliestCoreBA(IEngine engine) - : base(engine) - { - - } - - protected override void Run() - { - } - - protected override void OnStartup(StartupEventArgs args) - { - base.OnStartup(args); - - this.engine.Log(LogLevel.Standard, nameof(EarliestCoreBA)); - } - - protected override void OnShutdown(ShutdownEventArgs args) - { - base.OnShutdown(args); - - var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); - this.engine.Log(LogLevel.Standard, message); - } - } -} diff --git a/src/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs b/src/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs deleted file mode 100644 index 672e17ee..00000000 --- a/src/test/examples/EarliestCoreMBA/EarliestCoreBAFactory.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.EarliestCoreMBA.EarliestCoreBAFactory))] -namespace Example.EarliestCoreMBA -{ - using WixToolset.Mba.Core; - - public class EarliestCoreBAFactory : BaseBootstrapperApplicationFactory - { - private static int loadCount = 0; - - protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) - { - if (loadCount > 0) - { - engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); - } - ++loadCount; - return new EarliestCoreBA(engine); - } - } -} diff --git a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj b/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj deleted file mode 100644 index cb66c138..00000000 --- a/src/test/examples/EarliestCoreMBA/Example.EarliestCoreMBA.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp3.1 - win-x86;win-x64 - true - Earliest .NET Core MBA - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/examples/FullFramework2Bundle/Bundle.wxs b/src/test/examples/FullFramework2Bundle/Bundle.wxs deleted file mode 100644 index f0af975c..00000000 --- a/src/test/examples/FullFramework2Bundle/Bundle.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj b/src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj deleted file mode 100644 index ba75a9ff..00000000 --- a/src/test/examples/FullFramework2Bundle/FullFramework2Bundle.wixproj +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj b/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj deleted file mode 100644 index 21079ed1..00000000 --- a/src/test/examples/FullFramework2MBA/Example.FullFramework2MBA.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - net20 - Example.FullFramework2MBA - Example.FullFramework2MBA - embedded - win-x86 - - - - - - - - - - \ No newline at end of file diff --git a/src/test/examples/FullFramework2MBA/FullFramework2BA.cs b/src/test/examples/FullFramework2MBA/FullFramework2BA.cs deleted file mode 100644 index 32cd19c8..00000000 --- a/src/test/examples/FullFramework2MBA/FullFramework2BA.cs +++ /dev/null @@ -1,34 +0,0 @@ -// 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. - -namespace Example.FullFramework2MBA -{ - using WixToolset.Mba.Core; - - public class FullFramework2BA : BootstrapperApplication - { - public FullFramework2BA(IEngine engine) - : base(engine) - { - - } - - protected override void Run() - { - } - - protected override void OnStartup(StartupEventArgs args) - { - base.OnStartup(args); - - this.engine.Log(LogLevel.Standard, nameof(FullFramework2BA)); - } - - protected override void OnShutdown(ShutdownEventArgs args) - { - base.OnShutdown(args); - - var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); - this.engine.Log(LogLevel.Standard, message); - } - } -} diff --git a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs b/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs deleted file mode 100644 index 647c2040..00000000 --- a/src/test/examples/FullFramework2MBA/FullFramework2BAFactory.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework2MBA.FullFramework2BAFactory))] -namespace Example.FullFramework2MBA -{ - using WixToolset.Mba.Core; - - public class FullFramework2BAFactory : BaseBootstrapperApplicationFactory - { - private static int loadCount = 0; - - protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) - { - if (loadCount > 0) - { - engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); - } - ++loadCount; - return new FullFramework2BA(engine); - } - } -} diff --git a/src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config b/src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config deleted file mode 100644 index be450a4f..00000000 --- a/src/test/examples/FullFramework2MBA/WixToolset.Mba.Host.config +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - -
- - - - - - - - - - - - diff --git a/src/test/examples/FullFramework4Bundle/Bundle.wxs b/src/test/examples/FullFramework4Bundle/Bundle.wxs deleted file mode 100644 index 7b7cbf57..00000000 --- a/src/test/examples/FullFramework4Bundle/Bundle.wxs +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj b/src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj deleted file mode 100644 index ba75a9ff..00000000 --- a/src/test/examples/FullFramework4Bundle/FullFramework4Bundle.wixproj +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj b/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj deleted file mode 100644 index a05e7888..00000000 --- a/src/test/examples/FullFramework4MBA/Example.FullFramework4MBA.csproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - net48 - Full Framework v4 MBA - win-x86 - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/examples/FullFramework4MBA/FullFramework4BA.cs b/src/test/examples/FullFramework4MBA/FullFramework4BA.cs deleted file mode 100644 index 8ee3bd19..00000000 --- a/src/test/examples/FullFramework4MBA/FullFramework4BA.cs +++ /dev/null @@ -1,34 +0,0 @@ -// 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. - -namespace Example.FullFramework4MBA -{ - using WixToolset.Mba.Core; - - public class FullFramework4BA : BootstrapperApplication - { - public FullFramework4BA(IEngine engine) - : base(engine) - { - - } - - protected override void Run() - { - } - - protected override void OnStartup(StartupEventArgs args) - { - base.OnStartup(args); - - this.engine.Log(LogLevel.Standard, nameof(FullFramework4BA)); - } - - protected override void OnShutdown(ShutdownEventArgs args) - { - base.OnShutdown(args); - - var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); - this.engine.Log(LogLevel.Standard, message); - } - } -} diff --git a/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs b/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs deleted file mode 100644 index 6a571a54..00000000 --- a/src/test/examples/FullFramework4MBA/FullFramework4BAFactory.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.FullFramework4MBA.FullFramework4BAFactory))] -namespace Example.FullFramework4MBA -{ - using WixToolset.Mba.Core; - - public class FullFramework4BAFactory : BaseBootstrapperApplicationFactory - { - private static int loadCount = 0; - - protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) - { - if (loadCount > 0) - { - engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); - } - ++loadCount; - return new FullFramework4BA(engine); - } - } -} diff --git a/src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config b/src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config deleted file mode 100644 index 96678cda..00000000 --- a/src/test/examples/FullFramework4MBA/WixToolset.Mba.Host.config +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - -
- - - - - - - - - diff --git a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs deleted file mode 100644 index d5b543e8..00000000 --- a/src/test/examples/LatestCoreBundleFDD/FrameworkDependentBundle.wxs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj b/src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj deleted file mode 100644 index ba75a9ff..00000000 --- a/src/test/examples/LatestCoreBundleFDD/LatestCoreBundleFDD.wixproj +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj b/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj deleted file mode 100644 index 30a860ab..00000000 --- a/src/test/examples/LatestCoreBundleSCD/LatestCoreBundleSCD.wixproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - publish.Example.LatestCoreMBA.scd - ba.xslt - - - diff --git a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs deleted file mode 100644 index bedf0326..00000000 --- a/src/test/examples/LatestCoreBundleSCD/SelfContainedBundle.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/examples/LatestCoreBundleSCD/ba.xslt b/src/test/examples/LatestCoreBundleSCD/ba.xslt deleted file mode 100644 index acc7474c..00000000 --- a/src/test/examples/LatestCoreBundleSCD/ba.xslt +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - yes - - - - diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj b/src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj deleted file mode 100644 index 5ce89b64..00000000 --- a/src/test/examples/LatestCoreBundleTrimmedSCD/LatestCoreBundleTrimmedSCD.wixproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - publish.Example.LatestCoreMBA.trimmedscd - ba.xslt - - - diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs b/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs deleted file mode 100644 index 6059f8c1..00000000 --- a/src/test/examples/LatestCoreBundleTrimmedSCD/TrimmedSelfContainedBundle.wxs +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt b/src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt deleted file mode 100644 index acc7474c..00000000 --- a/src/test/examples/LatestCoreBundleTrimmedSCD/ba.xslt +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - yes - - - - diff --git a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj b/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj deleted file mode 100644 index 9f3f02d9..00000000 --- a/src/test/examples/LatestCoreMBA/Example.LatestCoreMBA.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - net5.0 - win-x86;win-x64 - true - Latest .NET Core MBA - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/test/examples/LatestCoreMBA/LatestCoreBA.cs b/src/test/examples/LatestCoreMBA/LatestCoreBA.cs deleted file mode 100644 index 50386a87..00000000 --- a/src/test/examples/LatestCoreMBA/LatestCoreBA.cs +++ /dev/null @@ -1,33 +0,0 @@ -// 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. - -namespace Example.LatestCoreMBA -{ - using WixToolset.Mba.Core; - - public class LatestCoreBA : BootstrapperApplication - { - public LatestCoreBA(IEngine engine) - : base(engine) - { - } - - protected override void Run() - { - } - - protected override void OnStartup(StartupEventArgs args) - { - base.OnStartup(args); - - this.engine.Log(LogLevel.Standard, nameof(LatestCoreBA)); - } - - protected override void OnShutdown(ShutdownEventArgs args) - { - base.OnShutdown(args); - - var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); - this.engine.Log(LogLevel.Standard, message); - } - } -} diff --git a/src/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs b/src/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs deleted file mode 100644 index fff3b5c5..00000000 --- a/src/test/examples/LatestCoreMBA/LatestCoreBAFactory.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.LatestCoreMBA.LatestCoreBAFactory))] -namespace Example.LatestCoreMBA -{ - using WixToolset.Mba.Core; - - public class LatestCoreBAFactory : BaseBootstrapperApplicationFactory - { - private static int loadCount = 0; - - protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) - { - if (loadCount > 0) - { - engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); - } - ++loadCount; - return new LatestCoreBA(engine); - } - } -} diff --git a/src/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/test/examples/TestEngine/Example.TestEngine.vcxproj deleted file mode 100644 index 99eb917e..00000000 --- a/src/test/examples/TestEngine/Example.TestEngine.vcxproj +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {3D44B67D-A475-49BA-8310-E39F6C117CC9} - Application - Console - Example.TestEngine - v142 - Unicode - 10.0 - - - - - - - - - - - - - - - Create - - - - - - - - - - - - - - - - - - - - - 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/ExampleTestEngine.cpp b/src/test/examples/TestEngine/ExampleTestEngine.cpp deleted file mode 100644 index fc1938fe..00000000 --- a/src/test/examples/TestEngine/ExampleTestEngine.cpp +++ /dev/null @@ -1,53 +0,0 @@ -// 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. - -#include "precomp.h" - -int __cdecl wmain(int argc, LPWSTR argv[]) -{ - HRESULT hr = S_OK; - BOOL fComInitialized = FALSE; - BOOL fShowUsage = FALSE; - - // initialize COM - hr = ::CoInitializeEx(NULL, COINIT_MULTITHREADED); - ExitOnFailure(hr, "Failed to initialize COM."); - fComInitialized = TRUE; - - ConsoleInitialize(); - - if (argc != 4) - { - fShowUsage = TRUE; - } - else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"reload", -1)) - { - hr = RunReloadEngine(argv[2], argv[3]); - } - else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"shutdown", -1)) - { - hr = RunShutdownEngine(argv[2], argv[3]); - } - else if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, NORM_IGNORECASE, argv[1], -1, L"waitforquit", -1)) - { - hr = RunWaitForQuitEngine(argv[2], argv[3]); - } - else - { - fShowUsage = TRUE; - } - - if (fShowUsage) - { - ConsoleWriteError(hr = E_INVALIDARG, CONSOLE_COLOR_RED, "Usage: Example.TestEngine.exe {reload|shutdown|waitforquit} Bundle.exe BA.dll"); - } - - ConsoleUninitialize(); - -LExit: - if (fComInitialized) - { - ::CoUninitialize(); - } - - return hr; -} diff --git a/src/test/examples/TestEngine/ReloadEngine.cpp b/src/test/examples/TestEngine/ReloadEngine.cpp deleted file mode 100644 index 46fd9afa..00000000 --- a/src/test/examples/TestEngine/ReloadEngine.cpp +++ /dev/null @@ -1,55 +0,0 @@ -// 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. - -#include "precomp.h" - -HRESULT RunReloadEngine( - __in LPCWSTR wzBundleFilePath, - __in LPCWSTR wzBAFilePath - ) -{ - HRESULT hr = S_OK; - TestEngine* pTestEngine = NULL; - - pTestEngine = new TestEngine(); - ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); - - hr = pTestEngine->Initialize(wzBundleFilePath); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine."); - - hr = pTestEngine->LoadBA(wzBAFilePath); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); - - hr = pTestEngine->SendStartupEvent(); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); - - hr = pTestEngine->SimulateQuit(0); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit."); - - hr = pTestEngine->RunApplication(); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); - - hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); - - pTestEngine->UnloadBA(); - - hr = pTestEngine->LoadBA(wzBAFilePath); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); - - hr = pTestEngine->SendStartupEvent(); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); - - hr = pTestEngine->SimulateQuit(0); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit."); - - hr = pTestEngine->RunApplication(); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); - - hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); - - pTestEngine->UnloadBA(); - -LExit: - return hr; -} diff --git a/src/test/examples/TestEngine/ReloadEngine.h b/src/test/examples/TestEngine/ReloadEngine.h deleted file mode 100644 index 0e8456af..00000000 --- a/src/test/examples/TestEngine/ReloadEngine.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -// 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. - - -HRESULT RunReloadEngine( - __in LPCWSTR wzBundleFilePath, - __in LPCWSTR wzBAFilePath - ); diff --git a/src/test/examples/TestEngine/ShutdownEngine.cpp b/src/test/examples/TestEngine/ShutdownEngine.cpp deleted file mode 100644 index 3b876e4e..00000000 --- a/src/test/examples/TestEngine/ShutdownEngine.cpp +++ /dev/null @@ -1,38 +0,0 @@ -// 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. - -#include "precomp.h" - -HRESULT RunShutdownEngine( - __in LPCWSTR wzBundleFilePath, - __in LPCWSTR wzBAFilePath - ) -{ - HRESULT hr = S_OK; - TestEngine* pTestEngine = NULL; - - pTestEngine = new TestEngine(); - ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); - - hr = pTestEngine->Initialize(wzBundleFilePath); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine."); - - hr = pTestEngine->LoadBA(wzBAFilePath); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); - - hr = pTestEngine->SendStartupEvent(); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); - - hr = pTestEngine->SimulateQuit(0); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to simulate quit."); - - hr = pTestEngine->RunApplication(); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); - - hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); - - pTestEngine->UnloadBA(); - -LExit: - return hr; -} diff --git a/src/test/examples/TestEngine/ShutdownEngine.h b/src/test/examples/TestEngine/ShutdownEngine.h deleted file mode 100644 index 0cfa147a..00000000 --- a/src/test/examples/TestEngine/ShutdownEngine.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -// 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. - - -HRESULT RunShutdownEngine( - __in LPCWSTR wzBundleFilePath, - __in LPCWSTR wzBAFilePath - ); diff --git a/src/test/examples/TestEngine/TestEngine.cpp b/src/test/examples/TestEngine/TestEngine.cpp deleted file mode 100644 index 4c7ec1c3..00000000 --- a/src/test/examples/TestEngine/TestEngine.cpp +++ /dev/null @@ -1,256 +0,0 @@ -// 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. - -#include "precomp.h" - -HRESULT TestEngine::Initialize( - __in LPCWSTR wzBundleFilePath - ) -{ - HRESULT hr = S_OK; - MSG msg = { }; - - LogInitialize(::GetModuleHandleW(NULL)); - - hr = LogOpen(NULL, PathFile(wzBundleFilePath), NULL, L"txt", FALSE, FALSE, NULL); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to open log."); - - ::PeekMessageW(&msg, NULL, WM_USER, WM_USER, PM_NOREMOVE); - -LExit: - return hr; -} - -HRESULT TestEngine::LoadBA( - __in LPCWSTR wzBAFilePath - ) -{ - HRESULT hr = S_OK; - BOOTSTRAPPER_COMMAND command = { }; - BOOTSTRAPPER_CREATE_ARGS args = { }; - PFN_BOOTSTRAPPER_APPLICATION_CREATE pfnCreate = NULL; - - if (m_pCreateResults || m_hBAModule) - { - ExitFunction1(hr = E_INVALIDSTATE); - } - - m_pCreateResults = static_cast(MemAlloc(sizeof(BOOTSTRAPPER_CREATE_RESULTS), TRUE)); - - command.cbSize = sizeof(BOOTSTRAPPER_COMMAND); - - hr = PathGetDirectory(wzBAFilePath, &command.wzBootstrapperWorkingFolder); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to allocate wzBootstrapperWorkingFolder"); - - hr = PathConcat(command.wzBootstrapperWorkingFolder, L"BootstrapperApplicationData.xml", &command.wzBootstrapperApplicationDataPath); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to allocate wzBootstrapperApplicationDataPath"); - - args.cbSize = sizeof(BOOTSTRAPPER_CREATE_ARGS); - args.pCommand = &command; - args.pfnBootstrapperEngineProc = TestEngine::EngineProc; - args.pvBootstrapperEngineProcContext = this; - args.qwEngineAPIVersion = MAKEQWORDVERSION(0, 0, 0, 1); - - m_pCreateResults->cbSize = sizeof(BOOTSTRAPPER_CREATE_RESULTS); - - m_hBAModule = ::LoadLibraryExW(wzBAFilePath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - 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."); - - hr = pfnCreate(&args, m_pCreateResults); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure on BootstrapperApplicationCreate."); - -LExit: - ReleaseStr(command.wzBootstrapperApplicationDataPath); - ReleaseStr(command.wzBootstrapperWorkingFolder); - - return hr; -} - -HRESULT TestEngine::Log( - __in BOOTSTRAPPER_LOG_LEVEL level, - __in LPCWSTR 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() -{ - HRESULT hr = S_OK; - MSG msg = { }; - BOOL fRet = FALSE; - - // Enter the message pump. - while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0))) - { - if (-1 == fRet) - { - ConsoleExitOnFailure(hr = E_UNEXPECTED, CONSOLE_COLOR_RED, "Unexpected return value from message pump."); - } - else - { - ProcessBAMessage(&msg); - } - } - -LExit: - return hr; -} - -HRESULT TestEngine::SendShutdownEvent( - __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction - ) -{ - HRESULT hr = S_OK; - BA_ONSHUTDOWN_ARGS shutdownArgs = { }; - BA_ONSHUTDOWN_RESULTS shutdownResults = { }; - shutdownArgs.cbSize = sizeof(BA_ONSHUTDOWN_ARGS); - shutdownResults.action = defaultAction; - shutdownResults.cbSize = sizeof(BA_ONSHUTDOWN_RESULTS); - hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN, &shutdownArgs, &shutdownResults, m_pCreateResults->pvBootstrapperApplicationProcContext); - return hr; -} - -HRESULT TestEngine::SendStartupEvent() -{ - HRESULT hr = S_OK; - BA_ONSTARTUP_ARGS startupArgs = { }; - BA_ONSTARTUP_RESULTS startupResults = { }; - startupArgs.cbSize = sizeof(BA_ONSTARTUP_ARGS); - startupResults.cbSize = sizeof(BA_ONSTARTUP_RESULTS); - hr = m_pCreateResults->pfnBootstrapperApplicationProc(BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP, &startupArgs, &startupResults, m_pCreateResults->pvBootstrapperApplicationProcContext); - return hr; -} - -HRESULT TestEngine::SimulateQuit( - __in DWORD dwExitCode - ) -{ - BAENGINE_QUIT_ARGS args = { }; - BAENGINE_QUIT_RESULTS results = { }; - - args.cbSize = sizeof(BAENGINE_QUIT_ARGS); - args.dwExitCode = dwExitCode; - - results.cbSize = sizeof(BAENGINE_QUIT_RESULTS); - - return BAEngineQuit(&args, &results); -} - -void TestEngine::UnloadBA() -{ - PFN_BOOTSTRAPPER_APPLICATION_DESTROY pfnDestroy = NULL; - BOOL fDisableUnloading = m_pCreateResults && m_pCreateResults->fDisableUnloading; - - ReleaseNullMem(m_pCreateResults); - - pfnDestroy = (PFN_BOOTSTRAPPER_APPLICATION_DESTROY)::GetProcAddress(m_hBAModule, "BootstrapperApplicationDestroy"); - - if (pfnDestroy) - { - pfnDestroy(); - } - - if (m_hBAModule) - { - if (!fDisableUnloading) - { - ::FreeLibrary(m_hBAModule); - } - - m_hBAModule = NULL; - } -} - -HRESULT TestEngine::BAEngineLog( - __in BAENGINE_LOG_ARGS* pArgs, - __in BAENGINE_LOG_RESULTS* /*pResults*/ - ) -{ - return Log(pArgs->level, pArgs->wzMessage); -} - -HRESULT TestEngine::BAEngineQuit( - __in BAENGINE_QUIT_ARGS* pArgs, - __in BAENGINE_QUIT_RESULTS* /*pResults*/ - ) -{ - HRESULT hr = S_OK; - - if (!::PostThreadMessageW(m_dwThreadId, WM_TESTENG_QUIT, static_cast(pArgs->dwExitCode), 0)) - { - ConsoleExitWithLastError(hr, CONSOLE_COLOR_RED, "Failed to post shutdown message."); - } - -LExit: - return hr; -} - -HRESULT WINAPI TestEngine::EngineProc( - __in BOOTSTRAPPER_ENGINE_MESSAGE message, - __in const LPVOID pvArgs, - __inout LPVOID pvResults, - __in_opt LPVOID pvContext - ) -{ - HRESULT hr = S_OK; - TestEngine* pContext = (TestEngine*)pvContext; - - if (!pContext || !pvArgs || !pvResults) - { - ExitFunction1(hr = E_INVALIDARG); - } - - switch (message) - { - case BOOTSTRAPPER_ENGINE_MESSAGE_LOG: - hr = pContext->BAEngineLog(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_ENGINE_MESSAGE_QUIT: - hr = pContext->BAEngineQuit(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - default: - hr = E_NOTIMPL; - break; - } - -LExit: - return hr; -} - -HRESULT TestEngine::ProcessBAMessage( - __in const MSG* pmsg - ) -{ - HRESULT hr = S_OK; - - switch (pmsg->message) - { - case WM_TESTENG_QUIT: - ::PostQuitMessage(static_cast(pmsg->wParam)); // go bye-bye. - break; - } - - return hr; -} - -TestEngine::TestEngine() -{ - m_hBAModule = NULL; - m_pCreateResults = NULL; - m_dwThreadId = ::GetCurrentThreadId(); -} - -TestEngine::~TestEngine() -{ - ReleaseMem(m_pCreateResults); -} diff --git a/src/test/examples/TestEngine/TestEngine.h b/src/test/examples/TestEngine/TestEngine.h deleted file mode 100644 index 44e813bd..00000000 --- a/src/test/examples/TestEngine/TestEngine.h +++ /dev/null @@ -1,80 +0,0 @@ -#pragma once -// 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. - - -enum WM_TESTENG -{ - WM_TESTENG_FIRST = WM_APP + 0xFFF, // this enum value must always be first. - - WM_TESTENG_DETECT, - WM_TESTENG_PLAN, - WM_TESTENG_ELEVATE, - WM_TESTENG_APPLY, - WM_TESTENG_LAUNCH_APPROVED_EXE, - WM_TESTENG_QUIT, - - WM_TESTENG_LAST, // this enum value must always be last. -}; - -class TestEngine -{ -public: - HRESULT Initialize( - __in LPCWSTR wzBundleFilePath - ); - - HRESULT LoadBA( - __in LPCWSTR wzBAFilePath - ); - - HRESULT Log( - __in BOOTSTRAPPER_LOG_LEVEL level, - __in LPCWSTR wzMessage - ); - - HRESULT RunApplication(); - - HRESULT SendShutdownEvent( - __in BOOTSTRAPPER_SHUTDOWN_ACTION defaultAction - ); - - HRESULT SendStartupEvent(); - - HRESULT SimulateQuit( - __in DWORD dwExitCode - ); - - void UnloadBA(); - -private: - HRESULT BAEngineLog( - __in BAENGINE_LOG_ARGS* pArgs, - __in BAENGINE_LOG_RESULTS* pResults - ); - - HRESULT BAEngineQuit( - __in BAENGINE_QUIT_ARGS* pArgs, - __in BAENGINE_QUIT_RESULTS* pResults - ); - - static HRESULT WINAPI EngineProc( - __in BOOTSTRAPPER_ENGINE_MESSAGE message, - __in const LPVOID pvArgs, - __inout LPVOID pvResults, - __in_opt LPVOID pvContext - ); - - HRESULT ProcessBAMessage( - __in const MSG* pmsg - ); - -public: - TestEngine(); - - ~TestEngine(); - -private: - HMODULE m_hBAModule; - BOOTSTRAPPER_CREATE_RESULTS* m_pCreateResults; - DWORD m_dwThreadId; -}; \ No newline at end of file diff --git a/src/test/examples/TestEngine/WaitForQuitEngine.cpp b/src/test/examples/TestEngine/WaitForQuitEngine.cpp deleted file mode 100644 index 2f80ba75..00000000 --- a/src/test/examples/TestEngine/WaitForQuitEngine.cpp +++ /dev/null @@ -1,35 +0,0 @@ -// 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. - -#include "precomp.h" - -HRESULT RunWaitForQuitEngine( - __in LPCWSTR wzBundleFilePath, - __in LPCWSTR wzBAFilePath - ) -{ - HRESULT hr = S_OK; - TestEngine* pTestEngine = NULL; - - pTestEngine = new TestEngine(); - ConsoleExitOnNull(pTestEngine, hr, E_OUTOFMEMORY, CONSOLE_COLOR_RED, "Failed to create new test engine."); - - hr = pTestEngine->Initialize(wzBundleFilePath); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to initialize engine."); - - hr = pTestEngine->LoadBA(wzBAFilePath); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to load BA."); - - hr = pTestEngine->SendStartupEvent(); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnStartup."); - - hr = pTestEngine->RunApplication(); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "Failed to run engine."); - - hr = pTestEngine->SendShutdownEvent(BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER); - ConsoleExitOnFailure(hr, CONSOLE_COLOR_RED, "BA returned failure for OnShutdown."); - - pTestEngine->UnloadBA(); - -LExit: - return hr; -} diff --git a/src/test/examples/TestEngine/WaitForQuitEngine.h b/src/test/examples/TestEngine/WaitForQuitEngine.h deleted file mode 100644 index 99e3f63c..00000000 --- a/src/test/examples/TestEngine/WaitForQuitEngine.h +++ /dev/null @@ -1,8 +0,0 @@ -#pragma once -// 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. - - -HRESULT RunWaitForQuitEngine( - __in LPCWSTR wzBundleFilePath, - __in LPCWSTR wzBAFilePath - ); diff --git a/src/test/examples/TestEngine/packages.config b/src/test/examples/TestEngine/packages.config deleted file mode 100644 index 548ddb48..00000000 --- a/src/test/examples/TestEngine/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/test/examples/TestEngine/precomp.cpp b/src/test/examples/TestEngine/precomp.cpp deleted file mode 100644 index 37664a1c..00000000 --- a/src/test/examples/TestEngine/precomp.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// 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. - -#include "precomp.h" diff --git a/src/test/examples/TestEngine/precomp.h b/src/test/examples/TestEngine/precomp.h deleted file mode 100644 index f943f420..00000000 --- a/src/test/examples/TestEngine/precomp.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once -// 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. - -#include -#include - -#include "dutil.h" -#include "conutil.h" -#include "logutil.h" -#include "memutil.h" -#include "pathutil.h" -#include "strutil.h" - -#include "BootstrapperEngine.h" -#include "BootstrapperApplication.h" - -#include "TestEngine.h" -#include "ReloadEngine.h" -#include "ShutdownEngine.h" -#include "WaitForQuitEngine.h" diff --git a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs b/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs deleted file mode 100644 index 68d742b0..00000000 --- a/src/test/examples/WPFCoreBundleFDD/FrameworkDependentBundle.wxs +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj b/src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj deleted file mode 100644 index ba75a9ff..00000000 --- a/src/test/examples/WPFCoreBundleFDD/WPFCoreBundleFDD.wixproj +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/src/test/examples/WPFCoreMBA/AssemblyInfo.cs b/src/test/examples/WPFCoreMBA/AssemblyInfo.cs deleted file mode 100644 index 03a5c7fa..00000000 --- a/src/test/examples/WPFCoreMBA/AssemblyInfo.cs +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -using System.Windows; - -[assembly:ThemeInfo( - ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located - //(used if a resource is not found in the page, - // or application resource dictionaries) - ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located - //(used if a resource is not found in the page, - // app, or any theme specific resource dictionaries) -)] diff --git a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj b/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj deleted file mode 100644 index 296e5be9..00000000 --- a/src/test/examples/WPFCoreMBA/Example.WPFCoreMBA.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - net5.0-windows - win-x86;win-x64 - true - WPF .NET Core MBA - true - - - - - - - - \ No newline at end of file diff --git a/src/test/examples/WPFCoreMBA/MainWindow.xaml b/src/test/examples/WPFCoreMBA/MainWindow.xaml deleted file mode 100644 index 40a27a06..00000000 --- a/src/test/examples/WPFCoreMBA/MainWindow.xaml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - diff --git a/src/test/examples/WPFCoreMBA/MainWindow.xaml.cs b/src/test/examples/WPFCoreMBA/MainWindow.xaml.cs deleted file mode 100644 index 4f61b807..00000000 --- a/src/test/examples/WPFCoreMBA/MainWindow.xaml.cs +++ /dev/null @@ -1,17 +0,0 @@ -// 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. - -namespace Example.WPFCoreMBA -{ - using System.Windows; - - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window - { - public MainWindow() - { - this.InitializeComponent(); - } - } -} diff --git a/src/test/examples/WPFCoreMBA/WPFCoreBA.cs b/src/test/examples/WPFCoreMBA/WPFCoreBA.cs deleted file mode 100644 index d50be813..00000000 --- a/src/test/examples/WPFCoreMBA/WPFCoreBA.cs +++ /dev/null @@ -1,42 +0,0 @@ -// 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. - -namespace Example.WPFCoreMBA -{ - using System.Windows.Threading; - using WixToolset.Mba.Core; - - public class WPFCoreBA : BootstrapperApplication - { - public WPFCoreBA(IEngine engine) - : base(engine) - { - } - - public Dispatcher BADispatcher { get; private set; } - - protected override void Run() - { - this.BADispatcher = Dispatcher.CurrentDispatcher; - var window = new MainWindow(); - window.Closed += (s, e) => this.BADispatcher.InvokeShutdown(); - //window.Show(); - //Dispatcher.Run(); - //this.engine.Quit(0); - } - - protected override void OnStartup(StartupEventArgs args) - { - base.OnStartup(args); - - this.engine.Log(LogLevel.Standard, nameof(WPFCoreBA)); - } - - protected override void OnShutdown(ShutdownEventArgs args) - { - base.OnShutdown(args); - - var message = "Shutdown," + args.Action.ToString() + "," + args.HResult.ToString(); - this.engine.Log(LogLevel.Standard, message); - } - } -} diff --git a/src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs b/src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs deleted file mode 100644 index a3ccdf9f..00000000 --- a/src/test/examples/WPFCoreMBA/WPFCoreBAFactory.cs +++ /dev/null @@ -1,22 +0,0 @@ -// 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. - -[assembly: WixToolset.Mba.Core.BootstrapperApplicationFactory(typeof(Example.WPFCoreMBA.WPFCoreBAFactory))] -namespace Example.WPFCoreMBA -{ - using WixToolset.Mba.Core; - - public class WPFCoreBAFactory : BaseBootstrapperApplicationFactory - { - private static int loadCount = 0; - - protected override IBootstrapperApplication Create(IEngine engine, IBootstrapperCommand bootstrapperCommand) - { - if (loadCount > 0) - { - engine.Log(LogLevel.Standard, $"Reloaded {loadCount} time(s)"); - } - ++loadCount; - return new WPFCoreBA(engine); - } - } -} diff --git a/src/test/examples/Wix.Build.props b/src/test/examples/Wix.Build.props deleted file mode 100644 index aad94bb6..00000000 --- a/src/test/examples/Wix.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - Bundle - .exe - -generate payloadgroup - $(OutputPath)examples\ - - diff --git a/src/test/examples/Wix.Build.targets b/src/test/examples/Wix.Build.targets deleted file mode 100644 index 7e6fe9f2..00000000 --- a/src/test/examples/Wix.Build.targets +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/test/examples/examples.proj b/src/test/examples/examples.proj deleted file mode 100644 index 08cb7511..00000000 --- a/src/test/examples/examples.proj +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - - EarliestCoreMBA\Example.EarliestCoreMBA.csproj - FullFramework2MBA\Example.FullFramework2MBA.csproj - FullFramework4MBA\Example.FullFramework4MBA.csproj - LatestCoreMBA\Example.LatestCoreMBA.csproj - WPFCoreMBA\Example.WPFCoreMBA.csproj - $(OutputPath)examples\publish\ - - - - - $(MBAPublishPath)Example.EarliestCoreMBA - - - $(MBAPublishPath)Example.LatestCoreMBA - - - $(MBAPublishPath)Example.WPFCoreMBA - true - true - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/version.json b/src/version.json new file mode 100644 index 00000000..5f857771 --- /dev/null +++ b/src/version.json @@ -0,0 +1,11 @@ +{ + "version": "4.0", + "publicReleaseRefSpec": [ + "^refs/heads/master$" + ], + "cloudBuild": { + "buildNumber": { + "enabled": true + } + } +} diff --git a/src/wix.snk b/src/wix.snk deleted file mode 100644 index 3908a66a..00000000 Binary files a/src/wix.snk and /dev/null differ diff --git a/src/wixext/BalBurnBackendExtension.cs b/src/wixext/BalBurnBackendExtension.cs deleted file mode 100644 index e8dc7a3e..00000000 --- a/src/wixext/BalBurnBackendExtension.cs +++ /dev/null @@ -1,171 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using System; - using System.Collections.Generic; - using System.Linq; - using WixToolset.Bal.Symbols; - using WixToolset.Data; - using WixToolset.Data.Burn; - using WixToolset.Data.Symbols; - using WixToolset.Extensibility; - - public class BalBurnBackendExtension : BaseBurnBackendBinderExtension - { - private static readonly IntermediateSymbolDefinition[] BurnSymbolDefinitions = - { - BalSymbolDefinitions.WixBalBAFactoryAssembly, - BalSymbolDefinitions.WixBalBAFunctions, - BalSymbolDefinitions.WixBalCondition, - BalSymbolDefinitions.WixBalPackageInfo, - BalSymbolDefinitions.WixDncOptions, - BalSymbolDefinitions.WixMbaPrereqInformation, - BalSymbolDefinitions.WixStdbaOptions, - BalSymbolDefinitions.WixStdbaOverridableVariable, - }; - - protected override IReadOnlyCollection SymbolDefinitions => BurnSymbolDefinitions; - - public override void SymbolsFinalized(IntermediateSection section) - { - base.SymbolsFinalized(section); - - var baSymbol = section.Symbols.OfType().SingleOrDefault(); - var baId = baSymbol?.Id?.Id; - if (null == baId) - { - return; - } - - var isStdBA = baId.StartsWith("WixStandardBootstrapperApplication"); - var isMBA = baId.StartsWith("WixManagedBootstrapperApplicationHost"); - var isDNC = baId.StartsWith("WixDotNetCoreBootstrapperApplicationHost"); - var isSCD = isDNC && this.VerifySCD(section); - - if (isDNC) - { - this.FinalizeBAFactorySymbol(section); - } - - if (isStdBA || isMBA || isDNC) - { - this.VerifyBAFunctions(section); - } - - if (isMBA || (isDNC && !isSCD)) - { - this.VerifyPrereqPackages(section, isDNC); - } - } - - private void FinalizeBAFactorySymbol(IntermediateSection section) - { - var factorySymbol = section.Symbols.OfType().SingleOrDefault(); - if (null == factorySymbol) - { - return; - } - - var factoryPayloadSymbol = section.Symbols.OfType() - .Where(p => p.Id.Id == factorySymbol.PayloadId) - .SingleOrDefault(); - if (null == factoryPayloadSymbol) - { - return; - } - - factorySymbol.FilePath = factoryPayloadSymbol.Name; - } - - private void VerifyBAFunctions(IntermediateSection section) - { - WixBalBAFunctionsSymbol baFunctionsSymbol = null; - foreach (var symbol in section.Symbols.OfType()) - { - if (null == baFunctionsSymbol) - { - baFunctionsSymbol = symbol; - } - else - { - this.Messaging.Write(BalErrors.MultipleBAFunctions(symbol.SourceLineNumbers)); - } - } - - var payloadPropertiesSymbols = section.Symbols.OfType().ToList(); - if (null == baFunctionsSymbol) - { - foreach (var payloadPropertiesSymbol in payloadPropertiesSymbols) - { - if (string.Equals(payloadPropertiesSymbol.Name, "bafunctions.dll", StringComparison.OrdinalIgnoreCase) && - BurnConstants.BurnUXContainerName == payloadPropertiesSymbol.ContainerRef) - { - this.Messaging.Write(BalWarnings.UnmarkedBAFunctionsDLL(payloadPropertiesSymbol.SourceLineNumbers)); - } - } - } - else - { - var payloadId = baFunctionsSymbol.Id; - var bundlePayloadSymbol = payloadPropertiesSymbols.Single(x => payloadId == x.Id); - if (BurnConstants.BurnUXContainerName != bundlePayloadSymbol.ContainerRef) - { - this.Messaging.Write(BalErrors.BAFunctionsPayloadRequiredInUXContainer(baFunctionsSymbol.SourceLineNumbers)); - } - } - } - - private void VerifyPrereqPackages(IntermediateSection section, bool isDNC) - { - var prereqInfoSymbols = section.Symbols.OfType().ToList(); - if (prereqInfoSymbols.Count == 0) - { - var message = isDNC ? BalErrors.MissingDNCPrereq() : BalErrors.MissingMBAPrereq(); - this.Messaging.Write(message); - return; - } - - var foundLicenseFile = false; - var foundLicenseUrl = false; - - foreach (var prereqInfoSymbol in prereqInfoSymbols) - { - if (null != prereqInfoSymbol.LicenseFile) - { - if (foundLicenseFile || foundLicenseUrl) - { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); - return; - } - - foundLicenseFile = true; - } - - if (null != prereqInfoSymbol.LicenseUrl) - { - if (foundLicenseFile || foundLicenseUrl) - { - this.Messaging.Write(BalErrors.MultiplePrereqLicenses(prereqInfoSymbol.SourceLineNumbers)); - return; - } - - foundLicenseUrl = true; - } - } - } - - private bool VerifySCD(IntermediateSection section) - { - var isSCD = false; - - var dncOptions = section.Symbols.OfType().SingleOrDefault(); - if (dncOptions != null) - { - isSCD = dncOptions.SelfContainedDeployment != 0; - } - - return isSCD; - } - } -} diff --git a/src/wixext/BalCompiler.cs b/src/wixext/BalCompiler.cs deleted file mode 100644 index 267345e7..00000000 --- a/src/wixext/BalCompiler.cs +++ /dev/null @@ -1,923 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using System; - using System.Collections.Generic; - using System.Xml.Linq; - using WixToolset.Bal.Symbols; - using WixToolset.Data; - using WixToolset.Data.Symbols; - using WixToolset.Extensibility; - using WixToolset.Extensibility.Data; - - /// - /// The compiler for the WiX Toolset Bal Extension. - /// - public sealed class BalCompiler : BaseCompilerExtension - { - private readonly Dictionary prereqInfoSymbolsByPackageId; - - private enum WixDotNetCoreBootstrapperApplicationHostTheme - { - Unknown, - None, - Standard, - } - - private enum WixManagedBootstrapperApplicationHostTheme - { - Unknown, - None, - Standard, - } - - private enum WixStandardBootstrapperApplicationTheme - { - Unknown, - HyperlinkLargeLicense, - HyperlinkLicense, - HyperlinkSidebarLicense, - None, - RtfLargeLicense, - RtfLicense, - } - - /// - /// Instantiate a new BalCompiler. - /// - public BalCompiler() - { - this.prereqInfoSymbolsByPackageId = new Dictionary(); - } - - public override XNamespace Namespace => "http://wixtoolset.org/schemas/v4/wxs/bal"; - - /// - /// Processes an element for the Compiler. - /// - /// - /// - /// Parent element of element to process. - /// Element to process. - /// Extra information about the context in which this element is being parsed. - public override void ParseElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary context) - { - switch (parentElement.Name.LocalName) - { - case "Bundle": - case "Fragment": - switch (element.Name.LocalName) - { - case "Condition": - this.ParseConditionElement(intermediate, section, element); - break; - case "ManagedBootstrapperApplicationPrereqInformation": - this.ParseMbaPrereqInfoElement(intermediate, section, element); - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - break; - case "BootstrapperApplication": - switch (element.Name.LocalName) - { - case "WixStandardBootstrapperApplication": - this.ParseWixStandardBootstrapperApplicationElement(intermediate, section, element); - break; - case "WixManagedBootstrapperApplicationHost": - this.ParseWixManagedBootstrapperApplicationHostElement(intermediate, section, element); - break; - case "WixDotNetCoreBootstrapperApplicationHost": - this.ParseWixDotNetCoreBootstrapperApplicationHostElement(intermediate, section, element); - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - break; - default: - this.ParseHelper.UnexpectedElement(parentElement, element); - break; - } - } - - /// - /// Processes an attribute for the Compiler. - /// - /// Source line number for the parent element. - /// Parent element of element to process. - /// Attribute to process. - /// Extra information about the context in which this element is being parsed. - public override void ParseAttribute(Intermediate intermediate, IntermediateSection section, XElement parentElement, XAttribute attribute, IDictionary context) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(parentElement); - WixMbaPrereqInformationSymbol prereqInfo; - - switch (parentElement.Name.LocalName) - { - case "ExePackage": - case "MsiPackage": - case "MspPackage": - case "MsuPackage": - string packageId; - if (!context.TryGetValue("PackageId", out packageId) || String.IsNullOrEmpty(packageId)) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); - } - else - { - switch (attribute.Name.LocalName) - { - case "DisplayInternalUICondition": - switch (parentElement.Name.LocalName) - { - case "MsiPackage": - case "MspPackage": - var displayInternalUICondition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); - section.AddSymbol(new WixBalPackageInfoSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, packageId)) - { - PackageId = packageId, - DisplayInternalUICondition = displayInternalUICondition, - }); - break; - default: - this.ParseHelper.UnexpectedAttribute(parentElement, attribute); - break; - } - break; - case "PrereqLicenseFile": - - if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) - { - // at the time the extension attribute is parsed, the compiler might not yet have - // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. - var prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); - - if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) - { - prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) - { - PackageId = packageId, - }); - - this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); - } - else - { - this.Messaging.Write(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile")); - break; - } - } - - if (null != prereqInfo.LicenseUrl) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseFile", "PrereqLicenseUrl")); - } - else - { - prereqInfo.LicenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); - } - break; - case "PrereqLicenseUrl": - - if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) - { - // at the time the extension attribute is parsed, the compiler might not yet have - // parsed the PrereqPackage attribute, so we need to get it directly from the parent element. - var prereqPackage = parentElement.Attribute(this.Namespace + "PrereqPackage"); - - if (null != prereqPackage && YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, prereqPackage)) - { - prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) - { - PackageId = packageId, - }); - - this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); - } - else - { - this.Messaging.Write(BalErrors.AttributeRequiresPrereqPackage(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl")); - break; - } - } - - if (null != prereqInfo.LicenseFile) - { - this.Messaging.Write(ErrorMessages.IllegalAttributeWithOtherAttribute(sourceLineNumbers, parentElement.Name.LocalName, "PrereqLicenseUrl", "PrereqLicenseFile")); - } - else - { - prereqInfo.LicenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attribute); - } - break; - case "PrereqPackage": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) - { - if (!this.prereqInfoSymbolsByPackageId.TryGetValue(packageId, out prereqInfo)) - { - prereqInfo = section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) - { - PackageId = packageId, - }); - - this.prereqInfoSymbolsByPackageId.Add(packageId, prereqInfo); - } - } - break; - default: - this.ParseHelper.UnexpectedAttribute(parentElement, attribute); - break; - } - } - break; - case "Payload": - string payloadId; - if (!context.TryGetValue("Id", out payloadId) || String.IsNullOrEmpty(payloadId)) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, parentElement.Name.LocalName, "Id", attribute.Name.LocalName)); - } - else - { - switch (attribute.Name.LocalName) - { - case "BAFactoryAssembly": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) - { - // There can only be one. - var id = new Identifier(AccessModifier.Global, "TheBAFactoryAssembly"); - section.AddSymbol(new WixBalBAFactoryAssemblySymbol(sourceLineNumbers, id) - { - PayloadId = payloadId, - }); - } - break; - case "BAFunctions": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) - { - section.AddSymbol(new WixBalBAFunctionsSymbol(sourceLineNumbers) - { - PayloadId = payloadId, - }); - } - break; - default: - this.ParseHelper.UnexpectedAttribute(parentElement, attribute); - break; - } - } - break; - case "Variable": - // at the time the extension attribute is parsed, the compiler might not yet have - // parsed the Name attribute, so we need to get it directly from the parent element. - var variableName = parentElement.Attribute("Name"); - if (null == variableName) - { - this.Messaging.Write(ErrorMessages.ExpectedParentWithAttribute(sourceLineNumbers, "Variable", "Overridable", "Name")); - } - else - { - switch (attribute.Name.LocalName) - { - case "Overridable": - if (YesNoType.Yes == this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attribute)) - { - section.AddSymbol(new WixStdbaOverridableVariableSymbol(sourceLineNumbers) - { - Name = variableName.Value, - }); - } - break; - default: - this.ParseHelper.UnexpectedAttribute(parentElement, attribute); - break; - } - } - break; - } - } - - /// - /// Parses a Condition element for Bundles. - /// - /// The element to parse. - private void ParseConditionElement(Intermediate intermediate, IntermediateSection section, XElement node) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - string condition = null; - string message = null; - - foreach (var attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "Message": - message = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Condition": - condition = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - - // Error check the values. - if (String.IsNullOrEmpty(condition)) - { - this.Messaging.Write(ErrorMessages.ConditionExpected(sourceLineNumbers, node.Name.LocalName)); - } - - if (null == message) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Message")); - } - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new WixBalConditionSymbol(sourceLineNumbers) - { - Condition = condition, - Message = message, - }); - } - } - - /// - /// Parses a Condition element for Bundles. - /// - /// The element to parse. - private void ParseMbaPrereqInfoElement(Intermediate intermediate, IntermediateSection section, XElement node) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - string packageId = null; - string licenseFile = null; - string licenseUrl = null; - - foreach (var attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "LicenseFile": - licenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "LicenseUrl": - licenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "PackageId": - packageId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - break; - default: - this.ParseHelper.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - - if (null == packageId) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "PackageId")); - } - - if (null == licenseFile && null == licenseUrl || - null != licenseFile && null != licenseUrl) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true)); - } - - if (!this.Messaging.EncounteredError) - { - section.AddSymbol(new WixMbaPrereqInformationSymbol(sourceLineNumbers) - { - PackageId = packageId, - LicenseFile = licenseFile, - LicenseUrl = licenseUrl, - }); - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBundlePackage, packageId); - } - } - - /// - /// Parses a WixStandardBootstrapperApplication element for Bundles. - /// - /// The element to parse. - private void ParseWixStandardBootstrapperApplicationElement(Intermediate intermediate, IntermediateSection section, XElement node) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - string launchTarget = null; - string launchTargetElevatedId = null; - string launchArguments = null; - var launchHidden = YesNoType.NotSet; - string launchWorkingDir = null; - string licenseFile = null; - string licenseUrl = null; - string logoFile = null; - string logoSideFile = null; - WixStandardBootstrapperApplicationTheme? theme = null; - string themeFile = null; - string localizationFile = null; - var suppressOptionsUI = YesNoType.NotSet; - var suppressDowngradeFailure = YesNoType.NotSet; - var suppressRepair = YesNoType.NotSet; - var showVersion = YesNoType.NotSet; - var supportCacheOnly = YesNoType.NotSet; - - foreach (var attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "LaunchTarget": - launchTarget = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "LaunchTargetElevatedId": - launchTargetElevatedId = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib); - break; - case "LaunchArguments": - launchArguments = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "LaunchHidden": - launchHidden = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "LaunchWorkingFolder": - launchWorkingDir = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "LicenseFile": - licenseFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "LicenseUrl": - licenseUrl = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty); - break; - case "LogoFile": - logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "LogoSideFile": - logoSideFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ThemeFile": - themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "LocalizationFile": - localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "SuppressOptionsUI": - suppressOptionsUI = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "SuppressDowngradeFailure": - suppressDowngradeFailure = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "SuppressRepair": - suppressRepair = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "ShowVersion": - showVersion = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "SupportCacheOnly": - supportCacheOnly = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "Theme": - var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (themeValue) - { - case "hyperlinkLargeLicense": - theme = WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense; - break; - case "hyperlinkLicense": - theme = WixStandardBootstrapperApplicationTheme.HyperlinkLicense; - break; - case "hyperlinkSidebarLicense": - theme = WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense; - break; - case "none": - theme = WixStandardBootstrapperApplicationTheme.None; - break; - case "rtfLargeLicense": - theme = WixStandardBootstrapperApplicationTheme.RtfLargeLicense; - break; - case "rtfLicense": - theme = WixStandardBootstrapperApplicationTheme.RtfLicense; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "hyperlinkLargeLicense", "hyperlinkLicense", "hyperlinkSidebarLicense", "none", "rtfLargeLicense", "rtfLicense")); - theme = WixStandardBootstrapperApplicationTheme.Unknown; // set a value to prevent expected attribute error below. - break; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); - } - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - - if (!theme.HasValue) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Theme")); - } - - if (theme != WixStandardBootstrapperApplicationTheme.None && String.IsNullOrEmpty(licenseFile) && null == licenseUrl) - { - this.Messaging.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "LicenseFile", "LicenseUrl", true)); - } - - if (!this.Messaging.EncounteredError) - { - if (!String.IsNullOrEmpty(launchTarget)) - { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTarget")) - { - Value = launchTarget, - Type = WixBundleVariableType.Formatted, - }); - } - - if (!String.IsNullOrEmpty(launchTargetElevatedId)) - { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchTargetElevatedId")) - { - Value = launchTargetElevatedId, - Type = WixBundleVariableType.Formatted, - }); - } - - if (!String.IsNullOrEmpty(launchArguments)) - { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchArguments")) - { - Value = launchArguments, - Type = WixBundleVariableType.Formatted, - }); - } - - if (YesNoType.Yes == launchHidden) - { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchHidden")) - { - Value = "yes", - Type = WixBundleVariableType.Formatted, - }); - } - - - if (!String.IsNullOrEmpty(launchWorkingDir)) - { - section.AddSymbol(new WixBundleVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "LaunchWorkingFolder")) - { - Value = launchWorkingDir, - Type = WixBundleVariableType.Formatted, - }); - } - - if (!String.IsNullOrEmpty(licenseFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseRtf")) - { - Value = licenseFile, - }); - } - - if (null != licenseUrl) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLicenseUrl")) - { - Value = licenseUrl, - }); - } - - if (!String.IsNullOrEmpty(logoFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogo")) - { - Value = logoFile, - }); - } - - if (!String.IsNullOrEmpty(logoSideFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaLogoSide")) - { - Value = logoSideFile, - }); - } - - if (!String.IsNullOrEmpty(themeFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeXml")) - { - Value = themeFile, - }); - } - - if (!String.IsNullOrEmpty(localizationFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "WixStdbaThemeWxl")) - { - Value = localizationFile, - }); - } - - if (YesNoType.Yes == suppressOptionsUI || YesNoType.Yes == suppressDowngradeFailure || YesNoType.Yes == suppressRepair || YesNoType.Yes == showVersion || YesNoType.Yes == supportCacheOnly) - { - var symbol = section.AddSymbol(new WixStdbaOptionsSymbol(sourceLineNumbers)); - if (YesNoType.Yes == suppressOptionsUI) - { - symbol.SuppressOptionsUI = 1; - } - - if (YesNoType.Yes == suppressDowngradeFailure) - { - symbol.SuppressDowngradeFailure = 1; - } - - if (YesNoType.Yes == suppressRepair) - { - symbol.SuppressRepair = 1; - } - - if (YesNoType.Yes == showVersion) - { - symbol.ShowVersion = 1; - } - - if (YesNoType.Yes == supportCacheOnly) - { - symbol.SupportCacheOnly = 1; - } - } - - var baId = "WixStandardBootstrapperApplication"; - switch (theme) - { - case WixStandardBootstrapperApplicationTheme.HyperlinkLargeLicense: - baId = "WixStandardBootstrapperApplication.HyperlinkLargeLicense"; - break; - case WixStandardBootstrapperApplicationTheme.HyperlinkLicense: - baId = "WixStandardBootstrapperApplication.HyperlinkLicense"; - break; - case WixStandardBootstrapperApplicationTheme.HyperlinkSidebarLicense: - baId = "WixStandardBootstrapperApplication.HyperlinkSidebarLicense"; - break; - case WixStandardBootstrapperApplicationTheme.RtfLargeLicense: - baId = "WixStandardBootstrapperApplication.RtfLargeLicense"; - break; - case WixStandardBootstrapperApplicationTheme.RtfLicense: - baId = "WixStandardBootstrapperApplication.RtfLicense"; - break; - } - - this.CreateBARef(section, sourceLineNumbers, node, baId); - } - } - - /// - /// Parses a WixManagedBootstrapperApplicationHost element for Bundles. - /// - /// The element to parse. - private void ParseWixManagedBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - string logoFile = null; - string themeFile = null; - string localizationFile = null; - WixManagedBootstrapperApplicationHostTheme? theme = null; - - foreach (var attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "LogoFile": - logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ThemeFile": - themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "LocalizationFile": - localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "Theme": - var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (themeValue) - { - case "none": - theme = WixManagedBootstrapperApplicationHostTheme.None; - break; - case "standard": - theme = WixManagedBootstrapperApplicationHostTheme.Standard; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "none", "standard")); - theme = WixManagedBootstrapperApplicationHostTheme.Unknown; - break; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); - } - } - - if (!theme.HasValue) - { - theme = WixManagedBootstrapperApplicationHostTheme.Standard; - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - - if (!this.Messaging.EncounteredError) - { - if (!String.IsNullOrEmpty(logoFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaLogo")) - { - Value = logoFile, - }); - } - - if (!String.IsNullOrEmpty(themeFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeXml")) - { - Value = themeFile, - }); - } - - if (!String.IsNullOrEmpty(localizationFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "PreqbaThemeWxl")) - { - Value = localizationFile, - }); - } - - var baId = "WixManagedBootstrapperApplicationHost"; - switch (theme) - { - case WixManagedBootstrapperApplicationHostTheme.Standard: - baId = "WixManagedBootstrapperApplicationHost.Standard"; - break; - } - - this.CreateBARef(section, sourceLineNumbers, node, baId); - } - } - - /// - /// Parses a WixDotNetCoreBootstrapperApplication element for Bundles. - /// - /// The element to parse. - private void ParseWixDotNetCoreBootstrapperApplicationHostElement(Intermediate intermediate, IntermediateSection section, XElement node) - { - var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node); - string logoFile = null; - string themeFile = null; - string localizationFile = null; - var selfContainedDeployment = YesNoType.NotSet; - WixDotNetCoreBootstrapperApplicationHostTheme? theme = null; - - foreach (var attrib in node.Attributes()) - { - if (String.IsNullOrEmpty(attrib.Name.NamespaceName) || this.Namespace == attrib.Name.Namespace) - { - switch (attrib.Name.LocalName) - { - case "LogoFile": - logoFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "ThemeFile": - themeFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "LocalizationFile": - localizationFile = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - break; - case "SelfContainedDeployment": - selfContainedDeployment = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib); - break; - case "Theme": - var themeValue = this.ParseHelper.GetAttributeValue(sourceLineNumbers, attrib); - switch (themeValue) - { - case "none": - theme = WixDotNetCoreBootstrapperApplicationHostTheme.None; - break; - case "standard": - theme = WixDotNetCoreBootstrapperApplicationHostTheme.Standard; - break; - default: - this.Messaging.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, "Theme", themeValue, "none", "standard")); - theme = WixDotNetCoreBootstrapperApplicationHostTheme.Unknown; - break; - } - break; - default: - this.ParseHelper.UnexpectedAttribute(node, attrib); - break; - } - } - else - { - this.ParseHelper.ParseExtensionAttribute(this.Context.Extensions, intermediate, section, node, attrib); - } - } - - if (!theme.HasValue) - { - theme = WixDotNetCoreBootstrapperApplicationHostTheme.Standard; - } - - this.ParseHelper.ParseForExtensionElements(this.Context.Extensions, intermediate, section, node); - - if (!this.Messaging.EncounteredError) - { - if (!String.IsNullOrEmpty(logoFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaLogo")) - { - Value = logoFile, - }); - } - - if (!String.IsNullOrEmpty(themeFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeXml")) - { - Value = themeFile, - }); - } - - if (!String.IsNullOrEmpty(localizationFile)) - { - section.AddSymbol(new WixVariableSymbol(sourceLineNumbers, new Identifier(AccessModifier.Global, "DncPreqbaThemeWxl")) - { - Value = localizationFile, - }); - } - - if (YesNoType.Yes == selfContainedDeployment) - { - section.AddSymbol(new WixDncOptionsSymbol(sourceLineNumbers) - { - SelfContainedDeployment = 1, - }); - } - - var baId = "WixDotNetCoreBootstrapperApplicationHost"; - switch (theme) - { - case WixDotNetCoreBootstrapperApplicationHostTheme.Standard: - baId = "WixDotNetCoreBootstrapperApplicationHost.Standard"; - break; - } - - this.CreateBARef(section, sourceLineNumbers, node, baId); - } - } - - private void CreateBARef(IntermediateSection section, SourceLineNumber sourceLineNumbers, XElement node, string name) - { - var id = this.ParseHelper.CreateIdentifierValueFromPlatform(name, this.Context.Platform, BurnPlatforms.X86 | BurnPlatforms.X64 | BurnPlatforms.ARM64); - if (id == null) - { - this.Messaging.Write(ErrorMessages.UnsupportedPlatformForElement(sourceLineNumbers, this.Context.Platform.ToString(), node.Name.LocalName)); - } - - if (!this.Messaging.EncounteredError) - { - this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixBootstrapperApplication, id); - } - } - } -} diff --git a/src/wixext/BalErrors.cs b/src/wixext/BalErrors.cs deleted file mode 100644 index bc0186c1..00000000 --- a/src/wixext/BalErrors.cs +++ /dev/null @@ -1,61 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using System; - using System.Resources; - using WixToolset.Data; - - public static class BalErrors - { - public static Message AttributeRequiresPrereqPackage(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) - { - return Message(sourceLineNumbers, Ids.AttributeRequiresPrereqPackage, "When the {0}/@{1} attribute is specified, the {0}/@PrereqPackage attribute must be set to \"yes\".", elementName, attributeName); - } - - public static Message BAFunctionsPayloadRequiredInUXContainer(SourceLineNumber sourceLineNumbers) - { - return Message(sourceLineNumbers, Ids.BAFunctionsPayloadRequiredInUXContainer, "The BAFunctions DLL Payload element must be located inside the BootstrapperApplication container."); - } - - public static Message MissingDNCPrereq() - { - return Message(null, Ids.MissingDNCPrereq, "There must be at least one PrereqPackage when using the DotNetCoreBootstrapperApplicationHost with SelfContainedDeployment set to \"no\"."); - } - - public static Message MissingMBAPrereq() - { - return Message(null, Ids.MissingMBAPrereq, "There must be at least one PrereqPackage when using the ManagedBootstrapperApplicationHost.\nThis is typically done by using the WixNetFxExtension and referencing one of the NetFxAsPrereq package groups."); - } - - public static Message MultipleBAFunctions(SourceLineNumber sourceLineNumbers) - { - return Message(sourceLineNumbers, Ids.MultipleBAFunctions, "WixStandardBootstrapperApplication doesn't support multiple BAFunctions DLLs."); - } - - public static Message MultiplePrereqLicenses(SourceLineNumber sourceLineNumbers) - { - return Message(sourceLineNumbers, Ids.MultiplePrereqLicenses, "There may only be one package in the bundle that has either the PrereqLicenseFile attribute or the PrereqLicenseUrl attribute."); - } - - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) - { - return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); - } - - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) - { - return new Message(sourceLineNumber, MessageLevel.Error, (int)id, resourceManager, resourceName, args); - } - - public enum Ids - { - AttributeRequiresPrereqPackage = 6801, - MissingMBAPrereq = 6802, - MultiplePrereqLicenses = 6803, - MultipleBAFunctions = 6804, - BAFunctionsPayloadRequiredInUXContainer = 6805, - MissingDNCPrereq = 6806, - } - } -} diff --git a/src/wixext/BalExtensionData.cs b/src/wixext/BalExtensionData.cs deleted file mode 100644 index 55daf005..00000000 --- a/src/wixext/BalExtensionData.cs +++ /dev/null @@ -1,30 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Extensibility; - - /// - /// The WiX Toolset Bal Extension. - /// - public sealed class BalExtensionData : BaseExtensionData - { - /// - /// Gets the default culture. - /// - /// The default culture. - public override string DefaultCulture => "en-US"; - - public override bool TryGetSymbolDefinitionByName(string name, out IntermediateSymbolDefinition symbolDefinition) - { - symbolDefinition = BalSymbolDefinitions.ByName(name); - return symbolDefinition != null; - } - - public override Intermediate GetLibrary(ISymbolDefinitionCreator symbolDefinitions) - { - return Intermediate.Load(typeof(BalExtensionData).Assembly, "WixToolset.Bal.bal.wixlib", symbolDefinitions); - } - } -} diff --git a/src/wixext/BalExtensionFactory.cs b/src/wixext/BalExtensionFactory.cs deleted file mode 100644 index 0bfb6c5f..00000000 --- a/src/wixext/BalExtensionFactory.cs +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using System; - using System.Collections.Generic; - using WixToolset.Extensibility; - - public class BalExtensionFactory : BaseExtensionFactory - { - protected override IReadOnlyCollection ExtensionTypes => new[] - { - typeof(BalCompiler), - typeof(BalExtensionData), - typeof(BalBurnBackendExtension), - }; - } -} diff --git a/src/wixext/BalWarnings.cs b/src/wixext/BalWarnings.cs deleted file mode 100644 index 18b25062..00000000 --- a/src/wixext/BalWarnings.cs +++ /dev/null @@ -1,31 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using System; - using System.Resources; - using WixToolset.Data; - - public static class BalWarnings - { - public static Message UnmarkedBAFunctionsDLL(SourceLineNumber sourceLineNumbers) - { - return Message(sourceLineNumbers, Ids.UnmarkedBAFunctionsDLL, "WixStandardBootstrapperApplication doesn't automatically load BAFunctions.dll. Use the bal:BAFunctions attribute to indicate that it should be loaded."); - } - - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) - { - return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); - } - - private static Message Message(SourceLineNumber sourceLineNumber, Ids id, ResourceManager resourceManager, string resourceName, params object[] args) - { - return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, resourceManager, resourceName, args); - } - - public enum Ids - { - UnmarkedBAFunctionsDLL = 6501, - } - } -} diff --git a/src/wixext/Symbols/BalSymbolDefinitions.cs b/src/wixext/Symbols/BalSymbolDefinitions.cs deleted file mode 100644 index 90865621..00000000 --- a/src/wixext/Symbols/BalSymbolDefinitions.cs +++ /dev/null @@ -1,80 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using System; - using WixToolset.Data; - using WixToolset.Data.Burn; - - public enum BalSymbolDefinitionType - { - WixBalBAFactoryAssembly, - WixBalBAFunctions, - WixBalCondition, - WixBalPackageInfo, - WixDncOptions, - WixMbaPrereqInformation, - WixStdbaOptions, - WixStdbaOverridableVariable, - } - - public static partial class BalSymbolDefinitions - { - public static readonly Version Version = new Version("4.0.0"); - - public static IntermediateSymbolDefinition ByName(string name) - { - if (!Enum.TryParse(name, out BalSymbolDefinitionType type)) - { - return null; - } - - return ByType(type); - } - - public static IntermediateSymbolDefinition ByType(BalSymbolDefinitionType type) - { - switch (type) - { - case BalSymbolDefinitionType.WixBalBAFactoryAssembly: - return BalSymbolDefinitions.WixBalBAFactoryAssembly; - - case BalSymbolDefinitionType.WixBalBAFunctions: - return BalSymbolDefinitions.WixBalBAFunctions; - - case BalSymbolDefinitionType.WixBalCondition: - return BalSymbolDefinitions.WixBalCondition; - - case BalSymbolDefinitionType.WixBalPackageInfo: - return BalSymbolDefinitions.WixBalPackageInfo; - - case BalSymbolDefinitionType.WixDncOptions: - return BalSymbolDefinitions.WixDncOptions; - - case BalSymbolDefinitionType.WixMbaPrereqInformation: - return BalSymbolDefinitions.WixMbaPrereqInformation; - - case BalSymbolDefinitionType.WixStdbaOptions: - return BalSymbolDefinitions.WixStdbaOptions; - - case BalSymbolDefinitionType.WixStdbaOverridableVariable: - return BalSymbolDefinitions.WixStdbaOverridableVariable; - - default: - throw new ArgumentOutOfRangeException(nameof(type)); - } - } - - static BalSymbolDefinitions() - { - WixBalBAFactoryAssembly.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixBalBAFunctions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixBalCondition.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixBalPackageInfo.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixDncOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixMbaPrereqInformation.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixStdbaOptions.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - WixStdbaOverridableVariable.AddTag(BurnConstants.BootstrapperApplicationDataSymbolDefinitionTag); - } - } -} diff --git a/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs b/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs deleted file mode 100644 index 52042e4c..00000000 --- a/src/wixext/Symbols/WixBalBAFactoryAssemblySymbol.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixBalBAFactoryAssembly = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixBalBAFactoryAssembly.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.PayloadId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBalBAFactorySymbolFields.FilePath), IntermediateFieldType.String), - }, - typeof(WixBalBAFactoryAssemblySymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixBalBAFactorySymbolFields - { - PayloadId, - FilePath, - } - - public class WixBalBAFactoryAssemblySymbol : IntermediateSymbol - { - public WixBalBAFactoryAssemblySymbol() : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, null, null) - { - } - - public WixBalBAFactoryAssemblySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFactoryAssembly, sourceLineNumber, id) - { - } - - public IntermediateField this[WixBalBAFactorySymbolFields index] => this.Fields[(int)index]; - - public string PayloadId - { - get => this.Fields[(int)WixBalBAFactorySymbolFields.PayloadId].AsString(); - set => this.Set((int)WixBalBAFactorySymbolFields.PayloadId, value); - } - - public string FilePath - { - get => this.Fields[(int)WixBalBAFactorySymbolFields.FilePath].AsString(); - set => this.Set((int)WixBalBAFactorySymbolFields.FilePath, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixBalBAFunctionsSymbol.cs b/src/wixext/Symbols/WixBalBAFunctionsSymbol.cs deleted file mode 100644 index 19c7602d..00000000 --- a/src/wixext/Symbols/WixBalBAFunctionsSymbol.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixBalBAFunctions = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixBalBAFunctions.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixBalBAFunctionsSymbolFields.PayloadId), IntermediateFieldType.String), - }, - typeof(WixBalBAFunctionsSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixBalBAFunctionsSymbolFields - { - PayloadId, - } - - public class WixBalBAFunctionsSymbol : IntermediateSymbol - { - public WixBalBAFunctionsSymbol() : base(BalSymbolDefinitions.WixBalBAFunctions, null, null) - { - } - - public WixBalBAFunctionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalBAFunctions, sourceLineNumber, id) - { - } - - public IntermediateField this[WixBalBAFunctionsSymbolFields index] => this.Fields[(int)index]; - - public string PayloadId - { - get => this.Fields[(int)WixBalBAFunctionsSymbolFields.PayloadId].AsString(); - set => this.Set((int)WixBalBAFunctionsSymbolFields.PayloadId, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixBalConditionSymbol.cs b/src/wixext/Symbols/WixBalConditionSymbol.cs deleted file mode 100644 index c2527fbc..00000000 --- a/src/wixext/Symbols/WixBalConditionSymbol.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixBalCondition = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixBalCondition.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Condition), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBalConditionSymbolFields.Message), IntermediateFieldType.String), - }, - typeof(WixBalConditionSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixBalConditionSymbolFields - { - Condition, - Message, - } - - public class WixBalConditionSymbol : IntermediateSymbol - { - public WixBalConditionSymbol() : base(BalSymbolDefinitions.WixBalCondition, null, null) - { - } - - public WixBalConditionSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalCondition, sourceLineNumber, id) - { - } - - public IntermediateField this[WixBalConditionSymbolFields index] => this.Fields[(int)index]; - - public string Condition - { - get => this.Fields[(int)WixBalConditionSymbolFields.Condition].AsString(); - set => this.Set((int)WixBalConditionSymbolFields.Condition, value); - } - - public string Message - { - get => this.Fields[(int)WixBalConditionSymbolFields.Message].AsString(); - set => this.Set((int)WixBalConditionSymbolFields.Message, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixBalPackageInfoSymbol.cs b/src/wixext/Symbols/WixBalPackageInfoSymbol.cs deleted file mode 100644 index b09cb191..00000000 --- a/src/wixext/Symbols/WixBalPackageInfoSymbol.cs +++ /dev/null @@ -1,55 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixBalPackageInfo = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixBalPackageInfo.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.PackageId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixBalPackageInfoSymbolFields.DisplayInternalUICondition), IntermediateFieldType.String), - }, - typeof(WixBalPackageInfoSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixBalPackageInfoSymbolFields - { - PackageId, - DisplayInternalUICondition, - } - - public class WixBalPackageInfoSymbol : IntermediateSymbol - { - public WixBalPackageInfoSymbol() : base(BalSymbolDefinitions.WixBalPackageInfo, null, null) - { - } - - public WixBalPackageInfoSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixBalPackageInfo, sourceLineNumber, id) - { - } - - public IntermediateField this[WixBalPackageInfoSymbolFields index] => this.Fields[(int)index]; - - public string PackageId - { - get => this.Fields[(int)WixBalPackageInfoSymbolFields.PackageId].AsString(); - set => this.Set((int)WixBalPackageInfoSymbolFields.PackageId, value); - } - - public string DisplayInternalUICondition - { - get => this.Fields[(int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition].AsString(); - set => this.Set((int)WixBalPackageInfoSymbolFields.DisplayInternalUICondition, value); - } - } -} diff --git a/src/wixext/Symbols/WixDncOptionsSymbol.cs b/src/wixext/Symbols/WixDncOptionsSymbol.cs deleted file mode 100644 index b9a41c21..00000000 --- a/src/wixext/Symbols/WixDncOptionsSymbol.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixDncOptions = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixDncOptions.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixDncOptionsSymbolFields.SelfContainedDeployment), IntermediateFieldType.Number), - }, - typeof(WixDncOptionsSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixDncOptionsSymbolFields - { - SelfContainedDeployment, - } - - public class WixDncOptionsSymbol : IntermediateSymbol - { - public WixDncOptionsSymbol() : base(BalSymbolDefinitions.WixDncOptions, null, null) - { - } - - public WixDncOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixDncOptions, sourceLineNumber, id) - { - } - - public IntermediateField this[WixDncOptionsSymbolFields index] => this.Fields[(int)index]; - - public int SelfContainedDeployment - { - get => this.Fields[(int)WixDncOptionsSymbolFields.SelfContainedDeployment].AsNumber(); - set => this.Set((int)WixDncOptionsSymbolFields.SelfContainedDeployment, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixMbaPrereqInformationSymbol.cs b/src/wixext/Symbols/WixMbaPrereqInformationSymbol.cs deleted file mode 100644 index e4d78da0..00000000 --- a/src/wixext/Symbols/WixMbaPrereqInformationSymbol.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixMbaPrereqInformation = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixMbaPrereqInformation.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.PackageId), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseFile), IntermediateFieldType.String), - new IntermediateFieldDefinition(nameof(WixMbaPrereqInformationSymbolFields.LicenseUrl), IntermediateFieldType.String), - }, - typeof(WixMbaPrereqInformationSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixMbaPrereqInformationSymbolFields - { - PackageId, - LicenseFile, - LicenseUrl, - } - - public class WixMbaPrereqInformationSymbol : IntermediateSymbol - { - public WixMbaPrereqInformationSymbol() : base(BalSymbolDefinitions.WixMbaPrereqInformation, null, null) - { - } - - public WixMbaPrereqInformationSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixMbaPrereqInformation, sourceLineNumber, id) - { - } - - public IntermediateField this[WixMbaPrereqInformationSymbolFields index] => this.Fields[(int)index]; - - public string PackageId - { - get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.PackageId].AsString(); - set => this.Set((int)WixMbaPrereqInformationSymbolFields.PackageId, value); - } - - public string LicenseFile - { - get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseFile].AsString(); - set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseFile, value); - } - - public string LicenseUrl - { - get => this.Fields[(int)WixMbaPrereqInformationSymbolFields.LicenseUrl].AsString(); - set => this.Set((int)WixMbaPrereqInformationSymbolFields.LicenseUrl, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixStdbaOptionsSymbol.cs b/src/wixext/Symbols/WixStdbaOptionsSymbol.cs deleted file mode 100644 index cb2694da..00000000 --- a/src/wixext/Symbols/WixStdbaOptionsSymbol.cs +++ /dev/null @@ -1,79 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixStdbaOptions = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixStdbaOptions.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressOptionsUI), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressDowngradeFailure), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SuppressRepair), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.ShowVersion), IntermediateFieldType.Number), - new IntermediateFieldDefinition(nameof(WixStdbaOptionsSymbolFields.SupportCacheOnly), IntermediateFieldType.Number), - }, - typeof(WixStdbaOptionsSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixStdbaOptionsSymbolFields - { - SuppressOptionsUI, - SuppressDowngradeFailure, - SuppressRepair, - ShowVersion, - SupportCacheOnly, - } - - public class WixStdbaOptionsSymbol : IntermediateSymbol - { - public WixStdbaOptionsSymbol() : base(BalSymbolDefinitions.WixStdbaOptions, null, null) - { - } - - public WixStdbaOptionsSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOptions, sourceLineNumber, id) - { - } - - public IntermediateField this[WixStdbaOptionsSymbolFields index] => this.Fields[(int)index]; - - public int SuppressOptionsUI - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressOptionsUI].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressOptionsUI, value); - } - - public int SuppressDowngradeFailure - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressDowngradeFailure, value); - } - - public int SuppressRepair - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.SuppressRepair].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.SuppressRepair, value); - } - - public int ShowVersion - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.ShowVersion].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.ShowVersion, value); - } - - public int SupportCacheOnly - { - get => this.Fields[(int)WixStdbaOptionsSymbolFields.SupportCacheOnly].AsNumber(); - set => this.Set((int)WixStdbaOptionsSymbolFields.SupportCacheOnly, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs b/src/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs deleted file mode 100644 index 1d84d1aa..00000000 --- a/src/wixext/Symbols/WixStdbaOverridableVariableSymbol.cs +++ /dev/null @@ -1,47 +0,0 @@ -// 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. - -namespace WixToolset.Bal -{ - using WixToolset.Data; - using WixToolset.Bal.Symbols; - - public static partial class BalSymbolDefinitions - { - public static readonly IntermediateSymbolDefinition WixStdbaOverridableVariable = new IntermediateSymbolDefinition( - BalSymbolDefinitionType.WixStdbaOverridableVariable.ToString(), - new[] - { - new IntermediateFieldDefinition(nameof(WixStdbaOverridableVariableSymbolFields.Name), IntermediateFieldType.String), - }, - typeof(WixStdbaOverridableVariableSymbol)); - } -} - -namespace WixToolset.Bal.Symbols -{ - using WixToolset.Data; - - public enum WixStdbaOverridableVariableSymbolFields - { - Name, - } - - public class WixStdbaOverridableVariableSymbol : IntermediateSymbol - { - public WixStdbaOverridableVariableSymbol() : base(BalSymbolDefinitions.WixStdbaOverridableVariable, null, null) - { - } - - public WixStdbaOverridableVariableSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(BalSymbolDefinitions.WixStdbaOverridableVariable, sourceLineNumber, id) - { - } - - public IntermediateField this[WixStdbaOverridableVariableSymbolFields index] => this.Fields[(int)index]; - - public string Name - { - get => this.Fields[(int)WixStdbaOverridableVariableSymbolFields.Name].AsString(); - set => this.Set((int)WixStdbaOverridableVariableSymbolFields.Name, value); - } - } -} \ No newline at end of file diff --git a/src/wixext/WixToolset.Bal.wixext.csproj b/src/wixext/WixToolset.Bal.wixext.csproj deleted file mode 100644 index 00451403..00000000 --- a/src/wixext/WixToolset.Bal.wixext.csproj +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - netstandard2.0 - WixToolset.Bal - WiX Toolset Bal Extension - WiX Toolset Bal Extension - embedded - $(MSBuildThisFileName).nuspec - true - Id=$(MSBuildThisFileName);Authors=$(Authors);Copyright=$(Copyright);Description=$(Description);Title=$(Title) - - - - - - - - - - - - - - - - - - - - - - $(OutputPath)..\ - $(NuspecProperties);Version=$(BuildVersionSimple);RepositoryCommit=$(SourceRevisionId);RepositoryType=$(RepositoryType);RepositoryUrl=$(PrivateRepositoryUrl);ProjectFolder=$(MSBuildThisFileDirectory) - - - diff --git a/src/wixext/WixToolset.Bal.wixext.nuspec b/src/wixext/WixToolset.Bal.wixext.nuspec deleted file mode 100644 index d9e704ae..00000000 --- a/src/wixext/WixToolset.Bal.wixext.nuspec +++ /dev/null @@ -1,26 +0,0 @@ - - - - $id$ - $version$ - $authors$ - $authors$ - MS-RL - https://github.com/wixtoolset/Bal.wixext - false - $title$ - $description$ - $copyright$ - - - - - - - - - - - - - diff --git a/src/wixext/WixToolset.Bal.wixext.targets b/src/wixext/WixToolset.Bal.wixext.targets deleted file mode 100644 index 70c5a19c..00000000 --- a/src/wixext/WixToolset.Bal.wixext.targets +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)..\tools\WixToolset.Bal.wixext.dll - - - - - diff --git a/src/wixlib/BalExtension_arm64.wxs b/src/wixlib/BalExtension_arm64.wxs deleted file mode 100644 index 1b9e11d2..00000000 --- a/src/wixlib/BalExtension_arm64.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/BalExtension_platform.wxi b/src/wixlib/BalExtension_platform.wxi deleted file mode 100644 index 33122fb2..00000000 --- a/src/wixlib/BalExtension_platform.wxi +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/BalExtension_x64.wxs b/src/wixlib/BalExtension_x64.wxs deleted file mode 100644 index 69a597ae..00000000 --- a/src/wixlib/BalExtension_x64.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/BalExtension_x86.wxs b/src/wixlib/BalExtension_x86.wxs deleted file mode 100644 index 3cdd4015..00000000 --- a/src/wixlib/BalExtension_x86.wxs +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/wixlib/Dnc.wxs b/src/wixlib/Dnc.wxs deleted file mode 100644 index d777c473..00000000 --- a/src/wixlib/Dnc.wxs +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/Mba.wxs b/src/wixlib/Mba.wxs deleted file mode 100644 index 2d407c88..00000000 --- a/src/wixlib/Mba.wxs +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj deleted file mode 100644 index fdcc7475..00000000 --- a/src/wixlib/bal.wixproj +++ /dev/null @@ -1,36 +0,0 @@ - - - - Library - true - en-us - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/wixlib/caDecor.wxi b/src/wixlib/caDecor.wxi deleted file mode 100644 index b1711518..00000000 --- a/src/wixlib/caDecor.wxi +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixlib/wixstdba.wxs b/src/wixlib/wixstdba.wxs deleted file mode 100644 index 8181b9b4..00000000 --- a/src/wixlib/wixstdba.wxs +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/wixstdba/Resources/1028/mbapreq.wxl b/src/wixstdba/Resources/1028/mbapreq.wxl deleted file mode 100644 index abd35ac7..00000000 --- a/src/wixstdba/Resources/1028/mbapreq.wxl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - [WixBundleName] 安裝程式 - [WixBundleName] 安裝程式需要 Microsoft .NET Framework - 您確定要取消嗎? - 安裝程式說明 - /passive | /quiet - 顯示最基本的 UI 但不顯示提示，或者不顯示 UI 也 - 不顯示提示。預設會顯示 UI 和所有提示。 - -/norestart - 隱藏任何重新啟動嘗試。根據預設，UI 會在重新啟動之前提示。 -/log log.txt - 記錄至特定檔案。預設會在 %TEMP% 建立記錄檔。 - 關閉(&C) - 請按一下 「接受並安裝」5D; 按鈕，接受 Microsoft .NET Framework <a href="#">授權合約</a>。 - 接受並安裝(&A) - 拒絕(&D) - 安裝進度 - 正在處理: - 取消(&) - 安裝失敗 - 一或多個問題導致安裝失敗。請修正這些問題，然後再重試安裝。如需詳細資訊，請查看<a href="#">記錄檔</a>。 - 必須重新啟動電腦，才能完成軟體的復原。 - 重新啟動(&R) - 關閉(&C) - diff --git a/src/wixstdba/Resources/1029/mbapreq.wxl b/src/wixstdba/Resources/1029/mbapreq.wxl deleted file mode 100644 index e28b4f74..00000000 --- a/src/wixstdba/Resources/1029/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - Instalace produktu [WixBundleName] - Pro instalaci produktu [WixBundleName] je vyžadováno rozhraní Microsoft .NET Framework. - Opravdu chcete akci zrušit? - Nápověda k instalaci - /passive | /quiet - Zobrazí minimální uživatelské rozhraní bez jakýchkoli - výzev, nebo nezobrazí žádné uživatelské rozhraní ani žádné výzvy. Ve výchozím - nastavení se jak uživatelské rozhraní, tak i všechny výzvy zobrazují. - -/norestart - Potlačí jakékoli pokusy o restartování. Ve výchozím nastavení - se v uživatelském rozhraní před restartováním zobrazí výzva. -/log log.txt - Nastaví, že se má zapisovat do konkrétního souboru protokolu. - Ve výchozím nastavení je soubor protokolu vytvořen v umístění %TEMP%. - &Zavřít - Kliknutím na tlačítko Přijmout a nainstalovat přijmete <a href="#">licenční podmínky</a> rozhraní Microsoft .NET Framework. - &Přijmout a instalovat - &Odmítnout - Průběh instalace - Probíhá zpracování: - &Storno - Instalace se nezdařila - Byly zjištěny problémy, kvůli kterým se instalaci nepodařilo dokončit. Odstraňte tyto problémy a potom instalaci opakujte. Další informace naleznete v <a href="#">souboru protokolu</a>. - Aby bylo možné zrušení instalace softwaru dokončit, je nutné počítač restartovat. - &Restartovat - &Zavřít - diff --git a/src/wixstdba/Resources/1030/mbapreq.wxl b/src/wixstdba/Resources/1030/mbapreq.wxl deleted file mode 100644 index a531467a..00000000 --- a/src/wixstdba/Resources/1030/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - Installation af [WixBundleName] - Microsoft .NET Framework skal være installeret i forbindelse med Installationen af [WixBundleName] - Er du sikker på, at du vil annullere? - Hjælp til installation - /passive | /quiet - viser en minimal brugergrænseflade uden prompter eller - viser ingen brugergrænseflade og ingen prompter. - Brugergrænsefladen og alle prompter vises som standard. - -/norestart - skjuler forsøg på genstart. Der vises som standard en - forespørgsel i brugergrænsefladen, før der genstartes. -/log log.txt - logfører til en bestemt fil. Der oprettes som standard en - logfil i %TEMP%. - &Luk - Klik på knappen "Acceptér og installér" for at acceptere <a href="#">licensvilkårene</a> for Microsoft .NET Framework. - &Acceptér og installér - &Afvis - Status for installation - Behandler: - &Annuller - Installationen blev ikke gennemført - Installationen blev ikke gennemført på grund af et eller flere problemer. Løs problemerne, og prøv derefter at installere igen. Se <a href="#">logfilen</a> for at få flere oplysninger. - Du skal genstarte computeren for at fuldføre annulleringen af opdateringen af softwaren. - &Genstart - &Luk - diff --git a/src/wixstdba/Resources/1031/mbapreq.wxl b/src/wixstdba/Resources/1031/mbapreq.wxl deleted file mode 100644 index ff8111f9..00000000 --- a/src/wixstdba/Resources/1031/mbapreq.wxl +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - [WixBundleName]-Setup - Für das [WixBundleName]-Setup ist Microsoft .NET Framework erforderlich. - Sind Sie sicher, dass Sie den Vorgang abbrechen möchten? - Setup-Hilfe - /passive | /quiet - zeigt eine minimale Benutzeroberfläche ohne - Eingabeaufforderungen oder keine Benutzeroberfläche und keine - Eingabeaufforderungen an. Standardmäßig werden die Benutzeroberfläche und - alle Eingabeaufforderungen angezeigt. - -/norestart - unterdrückt alle Neustartversuche. Standardmäßig fordert die - Benutzeroberfläche zum Bestätigen eines Neustarts auf. -/log log.txt - erstellt das Protokoll in einer bestimmten Datei. - Standardmäßig wird die Protokolldatei in "%TEMP%" erstellt. - &Schließen - Klicken Sie auf die Schaltfläche "Akzeptieren und installieren", um den Microsoft .NET Framework <a href="#">-Lizenzbedingungen</a> zuzustimmen. - &Akzeptieren und installieren - &Ablehnen - Setup-Status - Verarbeitung: - &Abbrechen - Setup-Fehler - Beim Setup ist aufgrund mindestens eines Problems ein Fehler aufgetreten. Beheben Sie die Probleme, und wiederholen Sie das Setup. Weitere Informationen finden Sie in der <a href="#">Protokolldatei</a>. - Sie müssen den Computer neu starten, um das Zurücksetzen der Software abzuschließen. - &Neu starten - &Schließen - diff --git a/src/wixstdba/Resources/1032/mbapreq.wxl b/src/wixstdba/Resources/1032/mbapreq.wxl deleted file mode 100644 index bc3703a3..00000000 --- a/src/wixstdba/Resources/1032/mbapreq.wxl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - Εγκατάσταση του [WixBundleName] - Για την εγκατάσταση του [WixBundleName] απαιτείται το Microsoft .NET Framework - Είστε βέβαιοι ότι θέλετε να γίνει ακύρωση; - Βοήθεια για την εγκατάσταση - /passive | /quiet - εμφανίζει ελάχιστο περιεχόμενο του περιβάλλοντος εργασίας - χρήστη χωρίς μηνύματα ή δεν εμφανίζει περιβάλλον εργασίας χρήστη και - μηνύματα. Από προεπιλογή, εμφανίζονται όλα τα μηνύματα και το περιβάλλον - εργασίας χρήστη. - -/norestart - αποκρύπτει οποιεσδήποτε προσπάθειες για επανεκκίνηση. Από - προεπιλογή, το περιβάλλον εργασίας χρήστη θα εμφανίσει μήνυμα πριν από την - επανεκκίνηση. -/log log.txt - πραγματοποιεί καταγραφή σε ένα συγκεκριμένο αρχείο. Από - προεπιλογή, δημιουργείται ένα αρχείο καταγραφής στο %TEMP%. - &Κλείσιμο - Κάντε κλικ στο κουμπί "Αποδοχή και εγκατάσταση" για να αποδεχτείτε τους <a href="#">όρους της άδειας χρήσης</a> του Microsoft .NET Framework. - &Αποδοχή και εγκατάσταση - &Απόρριψη - Πρόοδος εγκατάστασης - Επεξεργασία: - &Άκυρο - Αποτυχία εγκατάστασης - Ένα ή περισσότερα προβλήματα προκάλεσαν την αποτυχία της εγκατάστασης. Διορθώστε τα προβλήματα και μετά επαναλάβετε την εγκατάσταση. Για περισσότερες πληροφορίες, ανατρέξτε στο <a href="#">αρχείο καταγραφής</a>. - Για να ολοκληρωθεί η επαναφορά του λογισμικού, πρέπει να κάνετε επανεκκίνηση του υπολογιστή. - &Επανεκκίνηση - &Κλείσιμο - diff --git a/src/wixstdba/Resources/1035/mbapreq.wxl b/src/wixstdba/Resources/1035/mbapreq.wxl deleted file mode 100644 index 859e5b23..00000000 --- a/src/wixstdba/Resources/1035/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - [WixBundleName] -asennus - Microsoft .NET Framework tarvitaan [WixBundleName] -asennusta varten - Haluatko varmasti peruuttaa? - Asennusohjelman ohje - /passive | /quiet - näyttää mahdollisimman vähän käyttöliittymästä; ei - kehotteita tai ei käyttöliittymää ja kehotteita. Oletusarvoisesti - käyttöliittymä ja kaikki kehotteet näytetään. - -/norestart - estää uudelleenkäynnistysyritykset. Oletusarvoisesti - käyttöliittymä kysyy ennen uudelleenkäynnistystä. -/log loki.txt - kirjaa lokitiedot erityiseen tiedostoon. Oletusarvoisesti - lokitiedosto luodaan %TEMP%-kansioon. - &Sulje - Hyväksy Microsoft .NET Framework -ohjelman <a href="#">käyttöoikeusehdot</a> valitsemalla Hyväksy ja asenna. - &Hyväksy ja asenna - &Hylkää - Asennuksen edistyminen - Käsitellään: - &Peruuta - Asennus epäonnistui - Asennus epäonnistui yhdestä tai useammasta syystä. Korjaa ongelmat ja yritä suorittaa asennus sitten uudelleen. Lisätietoja on <a href="#">lokitiedostossa</a>. - Tietokone täytyy käynnistää uudelleen ohjelmiston palautuksen viimeistelemiseksi. - &Käynnistä uudelleen - &Sulje - diff --git a/src/wixstdba/Resources/1036/mbapreq.wxl b/src/wixstdba/Resources/1036/mbapreq.wxl deleted file mode 100644 index f67dfa8e..00000000 --- a/src/wixstdba/Resources/1036/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - Installation de [WixBundleName] - Microsoft .NET Framework requis pour l'installation de [WixBundleName] - Êtes-vous sûr de vouloir annuler ? - Aide de l'installation - /passive | /quiet - affiche une interface minimale sans invites ou n'affiche - aucune interface ni aucune invite. Par défaut, l'interface et toutes les - invites sont affichées. - -/norestart - annule toute tentative de redémarrage. Par défaut, l'interface - affiche une invite avant de redémarrer. -/log journal.txt - consigne les entrées de journal dans un fichier spécifique. - Par défaut, un fichier journal est créé dans %TEMP%. - &Fermer - Cliquez sur le bouton « Accepter et installer » pour accepter les <a href="#">termes du contrat de licence</a> Microsoft .NET Framework. - &Accepter et installer - &Refuser - Progression de l'installation - Traitement en cours : - &Annuler - L'installation a échoué - L'installation a échoué pour une ou plusieurs raisons. Corrigez les problèmes et recommencez l'installation. Pour plus d'informations, consultez le <a href="#">fichier journal</a>. - Vous devez redémarrer votre ordinateur pour effectuer la restauration du logiciel. - &Redémarrer - &Fermer - diff --git a/src/wixstdba/Resources/1038/mbapreq.wxl b/src/wixstdba/Resources/1038/mbapreq.wxl deleted file mode 100644 index 6a4b109d..00000000 --- a/src/wixstdba/Resources/1038/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - [WixBundleName] telepítő - A(z) [WixBundleName] telepítéséhez Microsoft .NET-keretrendszer szükséges - Biztosan megszakítja? - A telepítő súgója - /passive | /quiet - Minimális felhasználói felület megjelenítése kérdések - nélkül, illetve felhasználói felület és kérdések megjelenítése nélküli - telepítés. Alapesetben a felhasználói felület és minden kérdés megjelenik. - -/norestart - Az újraindítási kérések elrejtése. Alapesetben a felhasználói - felületen megjelennek az újraindítási kérések. -/log naplo.txt - Naplózás a megadott fájlba. Alapesetben a naplófájl a %TEMP% - könyvtárban jön létre. - &Bezárás - A Microsoft .NET-keretrendszer <a href="#">licencszerződésének</a> elfogadásához kattintson az „Elfogadás és telepítés” gombra. - &Elfogadás és telepítés - &Elutasítás - Telepítési folyamat - Feldolgozás: - &Mégse - A telepítés nem sikerült - Legalább egy olyan hiba lépett fel, amely a telepítés meghiúsulását okozta. Hárítsa el a hibákat, majd futtassa újra a telepítőt. További információt a <a href="#">naplófájlban </a> talál. - A szoftver visszaállításának befejezéséhez újra kell indítania a számítógépet. - &Újraindítás - &Bezárás - diff --git a/src/wixstdba/Resources/1040/mbapreq.wxl b/src/wixstdba/Resources/1040/mbapreq.wxl deleted file mode 100644 index f57d58e5..00000000 --- a/src/wixstdba/Resources/1040/mbapreq.wxl +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - Installazione di [WixBundleName] - Microsoft .NET Framework necessario per l'installazione di [WixBundleName] - Annullare? - Guida dell'installazione - /passive | /quiet - visualizza l'interfaccia utente minima senza istruzioni - oppure non visualizza né l'interfaccia utente né le istruzioni. Per - impostazione predefinita vengono visualizzate interfaccia utente e - istruzioni. - -/norestart - elimina eventuali tentativi di riavvio. Per impostazione - predefinita l'interfaccia utente chiede istruzioni prima del riavvio. -/log log.txt - registra in un file specifico. Per impostazione predefinita un - file di log viene creato in %TEMP%. - &Chiudi - Fare clic sul pulsante "Accetta e installa" per accettare le <a href="#">condizioni di licenza</a> di Microsoft .NET Framework. - &Accetta e installa - &Rifiuta - Stato installazione - Elaborazione in corso: - &Annulla - Installazione non riuscita - L'installazione non è riuscita a causa di uno o più problemi. Risolvere i problemi e provare di nuovo l'installazione. Per ulteriori informazioni vedere il <a href="#">file di log</a>. - È necessario riavviare il computer per completare il rollback del software. - &Riavvia - &Chiudi - diff --git a/src/wixstdba/Resources/1041/mbapreq.wxl b/src/wixstdba/Resources/1041/mbapreq.wxl deleted file mode 100644 index 3fe7b9b3..00000000 --- a/src/wixstdba/Resources/1041/mbapreq.wxl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - [WixBundleName] セットアップ - [WixBundleName] セットアップには Microsoft .NET Framework が必要です - 取り消しますか? - セットアップのヘルプ - /passive | /quiet - 最小の UI だけを表示してプロンプトは表示しないか、UI - もプロンプトも表示しません。 既定では、UI とすべてのプロンプトが表示されます。 - -/norestart - 再起動の試みをすべて抑制します。既定では、再起動の前に UI によりプロンプトが表示されます。 -/log log.txt - 特定のファイルにログを記録します。既定では、%TEMP% にログ ファイルが作成されます。 - 閉じる(&C) - Microsoft .NET Framework の<a href="#">ライセンス条項</a>に同意する場合は、［同意してインストール］5D; ボタンをクリックします。 - 同意してインストール(&A) - 同意しない(&) - セットアップの進行状況 - 処理中: - キャンセル(&C) - セットアップに失敗しました - 1 つ以上の問題が原因でセットアップに失敗しました。問題を解決してからセットアップをやり直してください。詳細については、<a href="#">ログ ファイル</a>を参照してください。 - ソフトウェアのロールバックを完了するには、コンピューターを再起動する必要があります。 - 再起動(&R) - 閉じる(&C) - diff --git a/src/wixstdba/Resources/1042/mbapreq.wxl b/src/wixstdba/Resources/1042/mbapreq.wxl deleted file mode 100644 index 0f53dcc3..00000000 --- a/src/wixstdba/Resources/1042/mbapreq.wxl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - [WixBundleName] 설치 - [WixBundleName] 설치에 필요한 Microsoft .NET Framework - 취소하시겠습니까? - 설치 도움말 - /passive | /quiet - 메시지 없이 최소 UI를 표시하거나 UI와 메시지를 전혀 - 표시하지 않습니다. 기본적으로 UI 및 모든 메시지는 표시됩니다. - -/norestart - 다시 시작하려는 시도를 무시합니다. 기본적으로 UI는 다시 시작하기 전에 메시지를 표시합니다. -/log log.txt - 특정 파일에 기록합니다. 기본적으로 로그 파일이 %TEMP%에 생성됩니다. - 닫기(&C) - Microsoft .NET Framework <a href="#">사용 조건</a>에 동의하려면 "동의 및 설치"를 클릭하십시오. - 동의 및 설치(&A) - 동의 안 함(&D) - 설치 진행률 - 처리 중: - 취소(&C) - 설치 실패 - 하나 이상의 문제로 인해 설치에 실패했습니다. 문제를 수정하고 설치를 다시 시도하십시오. 자세한 내용은 <a href="#">로그 파일</a>을 참조하십시오. - 소프트웨어의 롤백을 완료하려면 컴퓨터를 다시 시작해야 합니다. - 다시 시작(&R) - 닫기(&C) - diff --git a/src/wixstdba/Resources/1043/mbapreq.wxl b/src/wixstdba/Resources/1043/mbapreq.wxl deleted file mode 100644 index f4a2c78c..00000000 --- a/src/wixstdba/Resources/1043/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - [WixBundleName] Installatie - Microsoft .NET Framework is vereist voor installatie [WixBundleName] - Weet u zeker dat u de installatie wilt annuleren? - Help bij Setup - /passive | /quiet - geeft een minimale gebruikersinterface weer zonder prompts - of geeft geen gebruikersinterface en geen prompts weer. Gebruikersinterface - en alle prompts worden standaard weergegeven. - -/norestart - pogingen tot opnieuw opstarten onderdrukken. - Gebruikersinterface vraagt standaard alvorens opnieuw op te starten. -/log log.txt - registreert gegevens in een specifiek bestand. Een logbestand - wordt standaard in %TEMP% gemaakt. - &Sluiten - Klik op de knop 'Accepteren en installeren' om de <a href="#">licentievoorwaarden</a> van het Microsoft .NET Framework te accepteren. - &Accepteren en installeren - &Weigeren - Voortgang van de installatie - Verwerken: - &Annuleren - Installatie mislukt - Er zijn een of meer fouten opgetreden waardoor de installatie is mislukt. Corrigeer de problemen en voer Setup opnieuw uit. Raadpleeg het <a href="#">log boekbestand</a> voor meer informatie. - U moet uw computer opnieuw opstarten om het terugdraaien van de software te voltooien. - &Opnieuw opstarten - &Sluiten - diff --git a/src/wixstdba/Resources/1044/mbapreq.wxl b/src/wixstdba/Resources/1044/mbapreq.wxl deleted file mode 100644 index da5c8283..00000000 --- a/src/wixstdba/Resources/1044/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - [WixBundleName] Installasjonsprogram - Microsoft .NET Framework kreves for [WixBundleName]-installasjon - Er du sikker på at du vil avbryte? - Installasjonshjelp - /passive | /quiet - viser minimalt brukergrensesnitt uten ledetekster, eller - ikke noe brukergrensesnitt og ingen ledetekster. Som standard vises - brukergrensesnitt og alle ledetekster. - -/norestart - undertrykker alle forsøk på omstart. Som standard spør - brukergrensesnittet før omstart. -/log log.txt - skriver logg til en bestemt fil. Som standard opprettes en - loggfil i %TEMP%. - &Lukk - Klikk Godta og installer for å godta<a href="#">lisensvilkårene</a> for Microsoft .NET Framework. - &Godta og installer - &Avslå - Fremdrift for installasjon - Behandler: - &Avbryt - Installasjon mislyktes - Ett eller flere problemer var årsak til at installasjonen mislyktes. Løs problemene, og installer på nytt. Du finner flere opplysninger i <a href="#">loggfilen</a>. - Du må starte datamaskinen på nytt for å fullføre tilbakerullingen av programvaren. - &Start på nytt - &Lukk - diff --git a/src/wixstdba/Resources/1045/mbapreq.wxl b/src/wixstdba/Resources/1045/mbapreq.wxl deleted file mode 100644 index 7aca87c2..00000000 --- a/src/wixstdba/Resources/1045/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - Instalator programu [WixBundleName] - Do zainstalowania programu [WixBundleName] jest wymagany program Microsoft .NET Framework - Czy na pewno chcesz anulować? - Pomoc instalatora - /passive | /quiet - wyświetla minimalny interfejs użytkownika bez monitów - lub nie wyświetla interfejsu użytkownika ani monitów. Domyślnie jest - wyświetlany interfejs użytkownika i wszystkie monity. - -/norestart - pomija wszelkie próby ponownego uruchomienia. Domyślnie - interfejs użytkownika będzie wyświetlał monit przed ponownym uruchomieniem. -/log log.txt - zapisuje wpisy dziennika do określonego pliku. - Domyślnie plik dziennika jest tworzony w folderze %TEMP%. - &Zamknij - Kliknij przycisk Zaakceptuj i zainstaluj, aby zaakceptować <a href="#">warunki licencji</a> programu Microsoft .NET Framework. - &Zaakceptuj i zainstaluj - &Odrzuć - Postęp instalacji - Trwa przetwarzanie: - &Anuluj - Instalacja nie powiodła się - Co najmniej jeden problem spowodował niepowodzenie instalacji. Usuń problemy, a następnie ponów próbę instalacji. Aby uzyskać więcej informacji można znaleźć w <a href="#">pliku dziennika</a>. - Aby zakończyć wycofywanie oprogramowania, musisz ponownie uruchomić komputer. - &Uruchom ponownie - &Zamknij - diff --git a/src/wixstdba/Resources/1046/mbapreq.wxl b/src/wixstdba/Resources/1046/mbapreq.wxl deleted file mode 100644 index be185502..00000000 --- a/src/wixstdba/Resources/1046/mbapreq.wxl +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - [WixBundleName] Instalação - Microsoft .NET Framework é necessário para instalação do [WixBundleName] - Tem certeza de que deseja cancelar? - Ajuda da Instalação - /passive | /quiet - exibe UI mínima sem avisos ou exibe sem UI e - sem avisos. Por padrão a UI e todos avisos são exibidos. - -/norestart - suprime qualquer tentativa de reinicialização. Por padrão a UI - irá solicitar antes de reiniciar. -/log log.txt - logs para um arquivo específico. Por padrão um arquivo de log é - criado em %TEMP%. - &Fechar - Clique o botão "Aceitar e Instalar" para aceitar os termos de licença do Microsoft .NET Framework <a href="#"></a>. - &Aceitar e Instalar - &Recusar - Progresso da Instalação - Processando: - &Cancelar - Falha na Instalação - Um ou mais problemas causaram falha na instalação. Corrija os problemas e tente a instalação novamente. Para mais informações consulte o <a href="#">arquivo de log</a>. - Você deve reiniciar o computador para completar a reversão do software. - &Reiniciar - &Fechar - diff --git a/src/wixstdba/Resources/1049/mbapreq.wxl b/src/wixstdba/Resources/1049/mbapreq.wxl deleted file mode 100644 index a1aec7ed..00000000 --- a/src/wixstdba/Resources/1049/mbapreq.wxl +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Установка [WixBundleName] - Для установки [WixBundleName] требуется Microsoft .NET Framework - Вы действительно хотите отменить операцию? - Справка по установке - /passive | /quiet - отображение минимального ИП без запросов или работа без ИП - и беззапросов. По умолчанию отображаются ИП и все запросы. - -/norestart - отключение всех попыток перезагрузки. По умолчанию в ИП перед - перезагрузкой отображается запрос. -/log log.txt - запись журнала в указанный файл. По умолчанию файл журнала - создается в папке %TEMP%. - &Закрыть - Нажмите кнопку "Принять и установить", чтобы принять <a href="#">условия лицензии</a> Microsoft .NET Framework. - &Принять и установить - &Отклонить - Выполнение установки - Обработка: - &Отмена - Сбой установки - Не удалось выполнить установку из-за одной или нескольких проблем. Устраните эти проблемы, а затем снова запустите программу установки. Дополнительные сведения см. в <a href="#">файле журнала</a>. - Необходимо перезагрузить компьютер, чтобы завершить откат программного обеспечения. - &Перезагрузить - &Закрыть - diff --git a/src/wixstdba/Resources/1051/mbapreq.wxl b/src/wixstdba/Resources/1051/mbapreq.wxl deleted file mode 100644 index 9f0b4711..00000000 --- a/src/wixstdba/Resources/1051/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - [WixBundleName] – inštalácia - Na inštaláciu aplikácie [WixBundleName] sa vyžaduje súčasť Microsoft .NET Framework - Naozaj chcete zrušiť operáciu? - Pomocník pre inštaláciu - /passive | /quiet – zobrazí minimálne používateľské rozhranie bez výziev alebo - nezobrazí žiadne používateľské rozhranie ani výzvy. Predvolene sa - zobrazuje používateľské rozhranie aj všetky výzvy. - -/norestart – zruší všetky pokusy o reštart. Používateľské rozhranie - predvolene zobrazí pred reštartom výzvu. -/log log.txt – urobí záznam do určeného súboru. Súbor denníka sa predvolene - vytvorí v priečinku %TEMP%. - &Zavrieť - Kliknutím na tlačidlo Súhlasiť a inštalovať vyjadrite svoj súhlas s <a href="#">licenčnými podmienkami</a> súčasti Microsoft .NET Framework. - &Súhlasiť a inštalovať - &Odmietnuť - Priebeh inštalácie - Spracúva sa: - &Zrušiť - Inštalácia zlyhala - Inštalácia zlyhala pre jednu alebo viac príčin. Odstráňte problémy a skúste znova spustiť inštaláciu. Ďalšie informácie nájdete v <a href="#">súbore denníka</a>. - Dokončenie všetkých zmien softvéru vyžaduje reštart počítača. - &Reštartovať - &Zavrieť - diff --git a/src/wixstdba/Resources/1053/mbapreq.wxl b/src/wixstdba/Resources/1053/mbapreq.wxl deleted file mode 100644 index 72961409..00000000 --- a/src/wixstdba/Resources/1053/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - [WixBundleName]-installation - Microsoft .NET Framework krävs för installation av [WixBundleName] - Vill du avbryta? - Installationshjälp - /passive | /quiet - visar ett minimalt användargränssnitt utan prompter, - alternativt inget användargränssnitt och inga prompter. Som standard visas - användargränssnitt och samtliga prompter. - -/norestart - hejdar omstart. Som standard visar användargränssnittet en - prompt före omstart. -/log log.txt - skapar logg till en specifik fil. Som standard skapas loggfilen - i %TEMP%. - &Stäng - Klicka på knappen "Godkänn och installera" för att godkänna <a href="#">licensvillkoren</a> för Microsoft .NET Framework. - &Godkänn och installera - &Avbryt - Installationsförlopp - Bearbetar: - &Avbryt - Installationen misslyckades - Installationen misslyckades på grund av ett eller flera problem. Åtgärda problemen och försök igen. Se <a href="#">loggfilen</a> för mer information. - Starta om datorn för att återställa programmet. - &Starta om - &Stäng - diff --git a/src/wixstdba/Resources/1055/mbapreq.wxl b/src/wixstdba/Resources/1055/mbapreq.wxl deleted file mode 100644 index ee52da98..00000000 --- a/src/wixstdba/Resources/1055/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - [WixBundleName] Kurulumu - [WixBundleName] kurulumu için Microsoft .NET Framework gerekir - İptal etmek istediğinizden emin misiniz? - Kurulum Yardımı - /passive | /quiet - komut istemi olmayan olabildiğince küçük bir UI - görüntüler veya komut istemi ve UI görüntülemez. Varsayılan olarak UI - ve tüm komut istemleri görüntülenir. - -/norestart - yeniden başlatma denemelerini engeller. Varsayılan - olarak UI yeniden başlatmadan önce komut isteyecektir. -/log log.txt - belirli bir dosyayı günlük dosyası olarak kullanır. - Varsayılan olarak %TEMP% konumunda bir günlük dosyası oluşturulur. - &Kapat - Microsoft .NET Framework <a href="#">lisans şartlarını</a> kabul etmek için "Kabul Et ve Yükle" düğmesini tıklatın. - &Kabul Et ve Yükle - &Reddet - Kurulum İlerleme Durumu - İşleniyor: - &İptal - Kurulum Başarısız - Bir veya daha fazla sorun kurulumun başarısız olmasına neden oldu. Lütfen sorunları çözün ve kurulumu yeniden deneyin. Daha fazla bilgi için <a href="#">günlük dosyasına</a> bakın. - Yazılım geri alma işlemini tamamlamak için bilgisayarınızı yeniden başlatmanız gerekir. - &Yeniden Başlat - &Kapat - diff --git a/src/wixstdba/Resources/1060/mbapreq.wxl b/src/wixstdba/Resources/1060/mbapreq.wxl deleted file mode 100644 index f3b4bfe5..00000000 --- a/src/wixstdba/Resources/1060/mbapreq.wxl +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - [WixBundleName] Namestitev - Microsoft .NET Framework, potreben za namestitev paketa [WixBundleName] - Ali ste prepričani, da želite preklicati? - Pomoč za namestitev - /passive | /quiet - prikaže minimalni uporabniški vmesnik brez pozivov ali ne prikaže - uporabniškega vmesnika in pozivov. Privzeto so prikazani uporabniški vmesnik in - vsi pozivi. - -/norestart - skrije vse možnosti za vnovicni zagon. Privzeto uporabniški vmesnik - prikaže poziv pred ponovnim zagonom. -/log log.txt - beleži vnose v dnevnik v doloceno datoteko. Privzeto je datoteko - ustvarjena v mapi %TEMP%. - &Zapri - Kliknite »Sprejmi in namesti« in sprejmite <a href="#">licenčne pogoje</a> za Microsoft .NET Framework. - &Sprejmi in namesti - &Zavrni - Potek namestitve - Obdelovanje: - &Prekliči - Namestitev ni uspela - Namestitev ni uspela zaradi ene ali več težav. Odpravite težave in ponovno zaženite namestitev. Za več informacij glejte <a href="#">dnevniško datoteko</a>. - Za povrnitev prejšnjega stanja programske opreme morate ponovno zagnati računalnik. - &Ponovni zagon - &Zapri - diff --git a/src/wixstdba/Resources/2052/mbapreq.wxl b/src/wixstdba/Resources/2052/mbapreq.wxl deleted file mode 100644 index 63cdb418..00000000 --- a/src/wixstdba/Resources/2052/mbapreq.wxl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - [WixBundleName] 安装 - [WixBundleName] 安装需要 Microsoft .NET Framework - 是否确实要取消? - 安装程序帮助 - /passive | /quiet - 显示最小的 UI 且无提示，或者不显示 UI 且 - 无提示。默认情况下显示 UI 和所有提示。 - -/norestart - 隐藏任何重启提示。默认情况下 UI 会在重启前提示。 -/log log.txt - 记录到特定文件。默认情况下在 %TEMP% 中创建日志文件。 - 关闭(&C) - 单击“接受并安装”按钮以接受 Microsoft .NET Framework <a href="#">许可证条款</a>。 - 接受并安装(&A) - 拒绝(&D) - 安装进度 - 正在处理: - 取消(&C) - 安装失败 - 一个或多个问题导致安装失败。请解决问题，然后重新尝试安装。有关详情，请查看<a href="#">日志文件</a>。 - 必须重启计算机才能完成软件的回滚。 - 重启(&R) - 关闭(&C) - diff --git a/src/wixstdba/Resources/2070/mbapreq.wxl b/src/wixstdba/Resources/2070/mbapreq.wxl deleted file mode 100644 index 6a49ca31..00000000 --- a/src/wixstdba/Resources/2070/mbapreq.wxl +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Configuração do [WixBundleName] - O Microsoft .NET Framework é necessário para a configuração do [WixBundleName] - Tem a certeza de que pretende cancelar? - Ajuda da Configuração - /passive | /quiet - apresenta IU mínima sem mensagens ou não apresenta IU nem - mensagens. Por predefinição, são apresentadas a IU e todas as mensagens. - -/norestart - suprimir qualquer tentativa de reinício. Por predefinição, a IU - avisará antes de reiniciar. -/log log.txt - regista num ficheiro específico. Por predefinição, é criado um - ficheiro de registo em %TEMP%. - &Fechar - Clique no botão "Aceitar e Instalar" para aceitar os <a href="#">termos de licenciamento</a> do Microsoft .NET Framework. - &Aceitar e Instalar - &Recusar - Progresso da Configuração - A processar: - &Cancelar - Falha da Configuração - Um ou mais problemas provocaram a falha da configuração. Corrija os problemas e repita a configuração. Para mais informações, consulte o <a href="#">ficheiro de registo</a>. - Tem de reiniciar o computador para concluir a reversão do software. - &Reiniciar - &Fechar - diff --git a/src/wixstdba/Resources/3082/mbapreq.wxl b/src/wixstdba/Resources/3082/mbapreq.wxl deleted file mode 100644 index 0290624c..00000000 --- a/src/wixstdba/Resources/3082/mbapreq.wxl +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - Instalación de [WixBundleName] - La instalación de [WixBundleName] requiere Microsoft .NET Framework - ¿Está seguro de que desea cancelar? - Ayuda del programa de instalación - /passive | /quiet - muestra una interfaz de usuario mínima y no realiza - preguntas, o bien no muestra interfaz de usuario y no realiza preguntas. - De manera predeterminada se muestra la interfaz de usuario completa y se - realizan todas las preguntas necesarias. - -/norestart - suprime cualquier intento de reinicio. De manera predeterminada, - la interfaz de usuario preguntará si se desea reiniciar. -/log log.txt - registra los datos de instalación en un archivo específico. - De manera predeterminada se crea un archivo de registro en %TEMP%. - &Cerrar - Haga clic en el botón "Aceptar e instalar" para aceptar los <a href="#">términos de licencia</a> de Microsoft .NET Framework. - &Aceptar e instalar - &Rechazar - Progreso de la instalación - Procesando: - &Cancelar - Error de la instalación - No se pudo completar la instalación a causa de uno o varios problemas. Corrija los problemas y vuelva a intentar la instalación. Para más información, vea el <a href="#">archivo de registro</a>. - Debe reiniciar el equipo para completar la reversión del software. - &Reiniciar - &Cerrar - diff --git a/src/wixstdba/Resources/HyperlinkLargeTheme.xml b/src/wixstdba/Resources/HyperlinkLargeTheme.xml deleted file mode 100644 index 39a38ee0..00000000 --- a/src/wixstdba/Resources/HyperlinkLargeTheme.xml +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - - - - - - - - - - - - #(loc.InstallLicenseLinkText) - - #(loc.InstallAcceptCheckbox) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #(loc.FailureHyperlinkLogText) - - - - - - - diff --git a/src/wixstdba/Resources/HyperlinkSidebarTheme.xml b/src/wixstdba/Resources/HyperlinkSidebarTheme.xml deleted file mode 100644 index 1dff9d7e..00000000 --- a/src/wixstdba/Resources/HyperlinkSidebarTheme.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - - - - - - - - - - - - - #(loc.InstallLicenseLinkText) - - #(loc.InstallAcceptCheckbox) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #(loc.FailureHyperlinkLogText) - - - - - - - diff --git a/src/wixstdba/Resources/HyperlinkTheme.wxl b/src/wixstdba/Resources/HyperlinkTheme.wxl deleted file mode 100644 index e6e3f8ab..00000000 --- a/src/wixstdba/Resources/HyperlinkTheme.wxl +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - [WixBundleName] Setup - [WixBundleName] - Welcome - Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit. - Version [WixBundleVersion] - Are you sure you want to cancel? - Previous version - Setup Help - /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or - creates a complete local copy of the bundle in directory. Install is the default. - -/passive | /quiet - displays minimal UI with no prompts or displays no UI and - no prompts. By default UI and all prompts are displayed. - -/norestart - suppress any attempts to restart. By default UI will prompt before restart. -/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. - &Close - [WixBundleName] <a href="#">license terms</a>. - I &agree to the license terms and conditions - &Options - &Install - &Cancel - Setup Options - Install location: - &Browse - &OK - &Cancel - Setup Progress - Processing: - Initializing... - &Cancel - Modify Setup - &Repair - &Uninstall - &Cancel - Setup Successful - Installation Successfully Completed - Layout Successfully Completed - Repair Successfully Completed - Uninstall Successfully Completed - &Launch - You must restart your computer before you can use the software. - You must restart your computer to complete the removal of the software. - &Restart - &Close - Setup Failed - Setup Failed - Layout Failed - Repair Failed - Uninstall Failed - One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. - You must restart your computer to complete the rollback of the software. - &Restart - &Close - No action was taken as a system reboot is required. - diff --git a/src/wixstdba/Resources/HyperlinkTheme.xml b/src/wixstdba/Resources/HyperlinkTheme.xml deleted file mode 100644 index 657db34b..00000000 --- a/src/wixstdba/Resources/HyperlinkTheme.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - - - - - - - - - - #(loc.InstallLicenseLinkText) - #(loc.InstallAcceptCheckbox) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #(loc.FailureHyperlinkLogText) - - - - - - - diff --git a/src/wixstdba/Resources/LoremIpsumLicense.rtf b/src/wixstdba/Resources/LoremIpsumLicense.rtf deleted file mode 100644 index 1a183236..00000000 Binary files a/src/wixstdba/Resources/LoremIpsumLicense.rtf and /dev/null differ diff --git a/src/wixstdba/Resources/RtfLargeTheme.xml b/src/wixstdba/Resources/RtfLargeTheme.xml deleted file mode 100644 index 3571e13a..00000000 --- a/src/wixstdba/Resources/RtfLargeTheme.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #(loc.FailureHyperlinkLogText) - - - - - - - diff --git a/src/wixstdba/Resources/RtfTheme.wxl b/src/wixstdba/Resources/RtfTheme.wxl deleted file mode 100644 index f73fb994..00000000 --- a/src/wixstdba/Resources/RtfTheme.wxl +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - [WixBundleName] Setup - [WixBundleName] - Version [WixBundleVersion] - Are you sure you want to cancel? - Previous version - Setup Help - /install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or - creates a complete local copy of the bundle in directory. Install is the default. - -/passive | /quiet - displays minimal UI with no prompts or displays no UI and - no prompts. By default UI and all prompts are displayed. - -/norestart - suppress any attempts to restart. By default UI will prompt before restart. -/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. - &Close - I &agree to the license terms and conditions - &Options - &Install - &Cancel - Setup Options - Install location: - &Browse - &OK - &Cancel - Setup Progress - Processing: - Initializing... - &Cancel - Modify Setup - &Repair - &Uninstall - &Cancel - Setup Successful - Installation Successfully Completed - Layout Successfully Completed - Repair Successfully Completed - Uninstall Successfully Completed - &Launch - You must restart your computer before you can use the software. - You must restart your computer to complete the removal of the software. - &Restart - &Close - Setup Failed - Setup Failed - Layout Failed - Repair Failed - Uninstall Failed - One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. - You must restart your computer to complete the rollback of the software. - &Restart - &Close - No action was taken as a system reboot is required. - diff --git a/src/wixstdba/Resources/RtfTheme.xml b/src/wixstdba/Resources/RtfTheme.xml deleted file mode 100644 index d6535bac..00000000 --- a/src/wixstdba/Resources/RtfTheme.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - - - - - - - - - - - #(loc.InstallAcceptCheckbox) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #(loc.FailureHyperlinkLogText) - - - - - - - diff --git a/src/wixstdba/Resources/dncpreq.thm b/src/wixstdba/Resources/dncpreq.thm deleted file mode 100644 index 4ae61819..00000000 --- a/src/wixstdba/Resources/dncpreq.thm +++ /dev/null @@ -1,47 +0,0 @@ - - - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - - - - - - - - - - #(loc.InstallLicenseTerms) - - - - - - - - - - - - - #(loc.FailureLogLinkText) - - - - - - - diff --git a/src/wixstdba/Resources/dncpreq.wxl b/src/wixstdba/Resources/dncpreq.wxl deleted file mode 100644 index d6b73b5f..00000000 --- a/src/wixstdba/Resources/dncpreq.wxl +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - [WixBundleName] Setup - Microsoft .NET Core required for [WixBundleName] setup - Are you sure you want to cancel? - Setup Help - /passive | /quiet - displays minimal UI with no prompts or displays no UI and - no prompts. By default UI and all prompts are displayed. - -/norestart - suppress any attempts to restart. By default UI will prompt before restart. -/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. - &Close - Click the "Accept and Install" button to accept the Microsoft .NET Core <a href="#">license terms</a>. - &Accept and Install - &Decline - Setup Progress - Processing: - &Cancel - Setup Failed - One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. - You must restart your computer to complete the rollback of the software. - &Restart - &Close - [WixBundleName] cannot run on this machine. Install the latest updates and/or the latest OS to run in a supported environment. - No action was taken as a system reboot is required. - diff --git a/src/wixstdba/Resources/logo.png b/src/wixstdba/Resources/logo.png deleted file mode 100644 index 7adc6e11..00000000 Binary files a/src/wixstdba/Resources/logo.png and /dev/null differ diff --git a/src/wixstdba/Resources/logoSide.png b/src/wixstdba/Resources/logoSide.png deleted file mode 100644 index 308841c5..00000000 Binary files a/src/wixstdba/Resources/logoSide.png and /dev/null differ diff --git a/src/wixstdba/Resources/mbapreq.png b/src/wixstdba/Resources/mbapreq.png deleted file mode 100644 index c6e9527b..00000000 Binary files a/src/wixstdba/Resources/mbapreq.png and /dev/null differ diff --git a/src/wixstdba/Resources/mbapreq.thm b/src/wixstdba/Resources/mbapreq.thm deleted file mode 100644 index 4ae61819..00000000 --- a/src/wixstdba/Resources/mbapreq.thm +++ /dev/null @@ -1,47 +0,0 @@ - - - Segoe UI - Segoe UI - Segoe UI - Segoe UI - - - - - - - - - - - - #(loc.InstallLicenseTerms) - - - - - - - - - - - - - #(loc.FailureLogLinkText) - - - - - - - diff --git a/src/wixstdba/Resources/mbapreq.wxl b/src/wixstdba/Resources/mbapreq.wxl deleted file mode 100644 index 95e3a6ae..00000000 --- a/src/wixstdba/Resources/mbapreq.wxl +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - [WixBundleName] Setup - Microsoft .NET Framework required for [WixBundleName] setup - Are you sure you want to cancel? - Setup Help - /passive | /quiet - displays minimal UI with no prompts or displays no UI and - no prompts. By default UI and all prompts are displayed. - -/norestart - suppress any attempts to restart. By default UI will prompt before restart. -/log log.txt - logs to a specific file. By default a log file is created in %TEMP%. - &Close - Click the "Accept and Install" button to accept the Microsoft .NET Framework <a href="#">license terms</a>. - &Accept and Install - &Decline - Setup Progress - Processing: - &Cancel - Setup Failed - One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>. - You must restart your computer to complete the rollback of the software. - &Restart - &Close - [WixBundleName] cannot run on Windows 7 RTM with .NET 4.5.2 installed. Install Windows 7 SP1 to run in a supported environment. - No action was taken as a system reboot is required. - diff --git a/src/wixstdba/WixStandardBootstrapperApplication.cpp b/src/wixstdba/WixStandardBootstrapperApplication.cpp deleted file mode 100644 index d4bf7b43..00000000 --- a/src/wixstdba/WixStandardBootstrapperApplication.cpp +++ /dev/null @@ -1,4264 +0,0 @@ -// 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. - -#include "precomp.h" -#include "BalBaseBootstrapperApplicationProc.h" -#include "BalBaseBootstrapperApplication.h" - -static const LPCWSTR WIXBUNDLE_VARIABLE_ELEVATED = L"WixBundleElevated"; - -static const LPCWSTR WIXSTDBA_WINDOW_CLASS = L"WixStdBA"; - -static const LPCWSTR WIXSTDBA_VARIABLE_INSTALL_FOLDER = L"InstallFolder"; -static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH = L"LaunchTarget"; -static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID = L"LaunchTargetElevatedId"; -static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS = L"LaunchArguments"; -static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_HIDDEN = L"LaunchHidden"; -static const LPCWSTR WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER = L"LaunchWorkingFolder"; - -static const DWORD WIXSTDBA_ACQUIRE_PERCENTAGE = 30; - -static const LPCWSTR WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION = L"WixBundleFileVersion"; -static const LPCWSTR WIXSTDBA_VARIABLE_LANGUAGE_ID = L"WixStdBALanguageId"; -static const LPCWSTR WIXSTDBA_VARIABLE_RESTART_REQUIRED = L"WixStdBARestartRequired"; -static const LPCWSTR WIXSTDBA_VARIABLE_SHOW_VERSION = L"WixStdBAShowVersion"; -static const LPCWSTR WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI = L"WixStdBASuppressOptionsUI"; - -enum WIXSTDBA_STATE -{ - WIXSTDBA_STATE_INITIALIZING, - WIXSTDBA_STATE_INITIALIZED, - WIXSTDBA_STATE_HELP, - WIXSTDBA_STATE_DETECTING, - WIXSTDBA_STATE_DETECTED, - WIXSTDBA_STATE_PLANNING, - WIXSTDBA_STATE_PLANNED, - WIXSTDBA_STATE_APPLYING, - WIXSTDBA_STATE_CACHING, - WIXSTDBA_STATE_CACHED, - WIXSTDBA_STATE_EXECUTING, - WIXSTDBA_STATE_EXECUTED, - WIXSTDBA_STATE_APPLIED, - WIXSTDBA_STATE_FAILED, -}; - -enum WM_WIXSTDBA -{ - WM_WIXSTDBA_SHOW_HELP = WM_APP + 100, - WM_WIXSTDBA_DETECT_PACKAGES, - WM_WIXSTDBA_PLAN_PACKAGES, - WM_WIXSTDBA_APPLY_PACKAGES, - WM_WIXSTDBA_CHANGE_STATE, - WM_WIXSTDBA_SHOW_FAILURE, -}; - -// This enum must be kept in the same order as the vrgwzPageNames array. -enum WIXSTDBA_PAGE -{ - WIXSTDBA_PAGE_LOADING, - WIXSTDBA_PAGE_HELP, - WIXSTDBA_PAGE_INSTALL, - WIXSTDBA_PAGE_MODIFY, - WIXSTDBA_PAGE_PROGRESS, - WIXSTDBA_PAGE_PROGRESS_PASSIVE, - WIXSTDBA_PAGE_SUCCESS, - WIXSTDBA_PAGE_FAILURE, - COUNT_WIXSTDBA_PAGE, -}; - -// This array must be kept in the same order as the WIXSTDBA_PAGE enum. -static LPCWSTR vrgwzPageNames[] = { - L"Loading", - L"Help", - L"Install", - L"Modify", - L"Progress", - L"ProgressPassive", - L"Success", - L"Failure", -}; - -enum WIXSTDBA_CONTROL -{ - // Welcome page - WIXSTDBA_CONTROL_INSTALL_BUTTON = THEME_FIRST_ASSIGN_CONTROL_ID, - WIXSTDBA_CONTROL_EULA_RICHEDIT, - WIXSTDBA_CONTROL_EULA_LINK, - WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX, - - // Modify page - WIXSTDBA_CONTROL_REPAIR_BUTTON, - WIXSTDBA_CONTROL_UNINSTALL_BUTTON, - - // Progress page - WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, - WIXSTDBA_CONTROL_CACHE_PROGRESS_BAR, - WIXSTDBA_CONTROL_CACHE_PROGRESS_TEXT, - - WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, - WIXSTDBA_CONTROL_EXECUTE_PROGRESS_BAR, - WIXSTDBA_CONTROL_EXECUTE_PROGRESS_TEXT, - WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, - - WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, - WIXSTDBA_CONTROL_OVERALL_PROGRESS_BAR, - WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, - WIXSTDBA_CONTROL_OVERALL_PROGRESS_TEXT, - - WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, - - // Success page - WIXSTDBA_CONTROL_LAUNCH_BUTTON, - WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, - - // Failure page - WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, - WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, - WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, -}; - -static THEME_ASSIGN_CONTROL_ID vrgInitControls[] = { - { WIXSTDBA_CONTROL_INSTALL_BUTTON, L"InstallButton" }, - { WIXSTDBA_CONTROL_EULA_RICHEDIT, L"EulaRichedit" }, - { WIXSTDBA_CONTROL_EULA_LINK, L"EulaHyperlink" }, - { WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX, L"EulaAcceptCheckbox" }, - - { WIXSTDBA_CONTROL_REPAIR_BUTTON, L"RepairButton" }, - { WIXSTDBA_CONTROL_UNINSTALL_BUTTON, L"UninstallButton" }, - - { WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, L"CacheProgressPackageText" }, - { WIXSTDBA_CONTROL_CACHE_PROGRESS_BAR, L"CacheProgressbar" }, - { WIXSTDBA_CONTROL_CACHE_PROGRESS_TEXT, L"CacheProgressText" }, - { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, L"ExecuteProgressPackageText" }, - { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_BAR, L"ExecuteProgressbar" }, - { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_TEXT, L"ExecuteProgressText" }, - { WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, L"ExecuteProgressActionDataText"}, - { WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, L"OverallProgressPackageText" }, - { WIXSTDBA_CONTROL_OVERALL_PROGRESS_BAR, L"OverallProgressbar" }, - { WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, L"OverallCalculatedProgressbar" }, - { WIXSTDBA_CONTROL_OVERALL_PROGRESS_TEXT, L"OverallProgressText" }, - { WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, L"ProgressCancelButton" }, - - { WIXSTDBA_CONTROL_LAUNCH_BUTTON, L"LaunchButton" }, - { WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, L"SuccessRestartButton" }, - - { WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, L"FailureLogFileLink" }, - { WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, L"FailureMessageText" }, - { WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, L"FailureRestartButton" }, -}; - -typedef struct _WIXSTDBA_PACKAGE_INFO -{ - LPWSTR sczPackageId; - BOOL fWasAlreadyInstalled; - BOOL fPlannedToBeInstalled; - BOOL fSuccessfullyInstalled; -} WIXSTDBA_PACKAGE_INFO; - - -static HRESULT DAPI EvaluateVariableConditionCallback( - __in_z LPCWSTR wzCondition, - __out BOOL* pf, - __in_opt LPVOID pvContext - ); -static HRESULT DAPI FormatVariableStringCallback( - __in_z LPCWSTR wzFormat, - __inout LPWSTR* psczOut, - __in_opt LPVOID pvContext - ); -static HRESULT DAPI GetVariableNumericCallback( - __in_z LPCWSTR wzVariable, - __out LONGLONG* pllValue, - __in_opt LPVOID pvContext - ); -static HRESULT DAPI SetVariableNumericCallback( - __in_z LPCWSTR wzVariable, - __in LONGLONG llValue, - __in_opt LPVOID pvContext - ); -static HRESULT DAPI GetVariableStringCallback( - __in_z LPCWSTR wzVariable, - __inout LPWSTR* psczValue, - __in_opt LPVOID pvContext - ); -static HRESULT DAPI SetVariableStringCallback( - __in_z LPCWSTR wzVariable, - __in_z_opt LPCWSTR wzValue, - __in BOOL fFormatted, - __in_opt LPVOID pvContext - ); -static LPCSTR LoggingRequestStateToString( - __in BOOTSTRAPPER_REQUEST_STATE requestState - ); -static LPCSTR LoggingMsiFeatureStateToString( - __in BOOTSTRAPPER_FEATURE_STATE featureState - ); - - -class CWixStandardBootstrapperApplication : public CBalBaseBootstrapperApplication -{ -public: // IBootstrapperApplication - virtual STDMETHODIMP OnStartup() - { - HRESULT hr = S_OK; - DWORD dwUIThreadId = 0; - - // create UI thread - m_hUiThread = ::CreateThread(NULL, 0, UiThreadProc, this, 0, &dwUIThreadId); - if (!m_hUiThread) - { - ExitWithLastError(hr, "Failed to create UI thread."); - } - - LExit: - return hr; - } - - - virtual STDMETHODIMP OnShutdown( - __inout BOOTSTRAPPER_SHUTDOWN_ACTION* pAction - ) - { - HRESULT hr = S_OK; - - // wait for UI thread to terminate - if (m_hUiThread) - { - ::WaitForSingleObject(m_hUiThread, INFINITE); - ReleaseHandle(m_hUiThread); - } - - // If a restart was required. - if (m_fRestartRequired) - { - if (m_fAllowRestart) - { - *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RESTART; - } - - if (m_fPrereq) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, m_fAllowRestart ? "The prerequisites scheduled a restart. The bootstrapper application will be reloaded after the computer is restarted." - : "A restart is required by the prerequisites but the user delayed it. The bootstrapper application will be reloaded after the computer is restarted."); - } - } - else if (m_fPrereqInstalled) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were successfully installed. The bootstrapper application will be reloaded."); - *pAction = BOOTSTRAPPER_SHUTDOWN_ACTION_RELOAD_BOOTSTRAPPER; - } - else if (m_fPrereqAlreadyInstalled) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were already installed. The bootstrapper application will not be reloaded to prevent an infinite loop."); - } - else if (m_fPrereq) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "The prerequisites were not successfully installed, error: 0x%x. The bootstrapper application will be not reloaded.", m_hrFinal); - } - - return hr; - } - - - virtual STDMETHODIMP OnDetectRelatedBundle( - __in LPCWSTR wzBundleId, - __in BOOTSTRAPPER_RELATION_TYPE relationType, - __in LPCWSTR wzBundleTag, - __in BOOL fPerMachine, - __in LPCWSTR wzVersion, - __in BOOTSTRAPPER_RELATED_OPERATION operation, - __in BOOL fMissingFromCache, - __inout BOOL* pfCancel - ) - { - BAL_INFO_PACKAGE* pPackage = NULL; - - if (!fMissingFromCache) - { - if (SUCCEEDED(BalInfoAddRelatedBundleAsPackage(&m_Bundle.packages, wzBundleId, relationType, fPerMachine, &pPackage))) - { - InitializePackageInfoForPackage(pPackage); - } - - // If we're not doing a prerequisite install, remember when our bundle would cause a downgrade. - if (!m_fPrereq && BOOTSTRAPPER_RELATED_OPERATION_DOWNGRADE == operation) - { - m_fDowngrading = TRUE; - } - } - - return CBalBaseBootstrapperApplication::OnDetectRelatedBundle(wzBundleId, relationType, wzBundleTag, fPerMachine, wzVersion, operation, fMissingFromCache, pfCancel); - } - - - virtual STDMETHODIMP OnDetectPackageComplete( - __in LPCWSTR wzPackageId, - __in HRESULT /*hrStatus*/, - __in BOOTSTRAPPER_PACKAGE_STATE state - ) - { - WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; - BAL_INFO_PACKAGE* pPackage = NULL; - - if (BOOTSTRAPPER_PACKAGE_STATE_PRESENT == state && - SUCCEEDED(GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage)) && - pPackageInfo) - { - // If the package is already installed, remember that. - pPackageInfo->fWasAlreadyInstalled = TRUE; - } - - return S_OK; - } - - - virtual STDMETHODIMP OnDetectComplete( - __in HRESULT hrStatus, - __in BOOL /*fEligibleForCleanup*/ - ) - { - HRESULT hr = S_OK; - // If we're not interacting with the user or we're doing a layout or we're resuming just after a force restart - // then automatically start planning. - BOOL fSkipToPlan = SUCCEEDED(hrStatus) && - (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || - BOOTSTRAPPER_ACTION_LAYOUT == m_command.action || - BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType); - // If we're requiring user input (which currently means Install, Repair, or Uninstall) - // or if we're skipping to an action that modifies machine state - // then evaluate conditions. - BOOL fEvaluateConditions = SUCCEEDED(hrStatus) && - (!fSkipToPlan || BOOTSTRAPPER_ACTION_LAYOUT < m_command.action && BOOTSTRAPPER_ACTION_UPDATE_REPLACE > m_command.action); - - if (fEvaluateConditions) - { - hrStatus = EvaluateConditions(); - } - - if (FAILED(hrStatus)) - { - fSkipToPlan = FALSE; - } - else - { - if (m_fPrereq) - { - m_fPrereqAlreadyInstalled = TRUE; - - // At this point we have to assume that all prerequisite packages need to be installed, so set to false if any of them aren't installed. - for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) - { - BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i]; - WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast(pPackage->pvCustomData); - if (pPackage->fPrereqPackage && pPackageInfo && !pPackageInfo->fWasAlreadyInstalled) - { - m_fPrereqAlreadyInstalled = FALSE; - break; - } - } - } - } - - SetState(WIXSTDBA_STATE_DETECTED, hrStatus); - - if (fSkipToPlan) - { - ::PostMessageW(m_hWnd, WM_WIXSTDBA_PLAN_PACKAGES, 0, m_command.action); - } - - return hr; - } - - - virtual STDMETHODIMP OnPlanRelatedBundle( - __in_z LPCWSTR wzBundleId, - __in BOOTSTRAPPER_REQUEST_STATE recommendedState, - __inout_z BOOTSTRAPPER_REQUEST_STATE* pRequestedState, - __inout BOOL* pfCancel - ) - { - // If we're only installing prerequisites, do not touch related bundles. - if (m_fPrereq) - { - *pRequestedState = BOOTSTRAPPER_REQUEST_STATE_NONE; - } - - return CBalBaseBootstrapperApplication::OnPlanRelatedBundle(wzBundleId, recommendedState, pRequestedState, pfCancel); - } - - - virtual STDMETHODIMP OnPlanPackageBegin( - __in_z LPCWSTR wzPackageId, - __in BOOTSTRAPPER_PACKAGE_STATE state, - __in BOOL fCached, - __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition, - __in BOOTSTRAPPER_REQUEST_STATE recommendedState, - __in BOOTSTRAPPER_CACHE_TYPE recommendedCacheType, - __inout BOOTSTRAPPER_REQUEST_STATE* pRequestState, - __inout BOOTSTRAPPER_CACHE_TYPE* pRequestedCacheType, - __inout BOOL* pfCancel - ) - { - HRESULT hr = S_OK; - WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; - BAL_INFO_PACKAGE* pPackage = NULL; - - // If we're planning to install prerequisites, install them. The prerequisites need to be installed - // in all cases (even uninstall!) so the BA can load next. - if (m_fPrereq) - { - // Only install prerequisite packages, and check the InstallCondition on them. - BOOL fInstall = FALSE; - hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); - if (SUCCEEDED(hr) && pPackage->fPrereqPackage && pPackageInfo) - { - pPackageInfo->fPlannedToBeInstalled = fInstall = BOOTSTRAPPER_PACKAGE_CONDITION_FALSE != installCondition; - } - - if (fInstall) - { - *pRequestState = BOOTSTRAPPER_REQUEST_STATE_PRESENT; - } - else - { - *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE; - } - - // Don't force cache packages while installing prerequisites. - if (BOOTSTRAPPER_CACHE_TYPE_FORCE == *pRequestedCacheType) - { - *pRequestedCacheType = BOOTSTRAPPER_CACHE_TYPE_KEEP; - } - } - else if (m_sczAfterForcedRestartPackage) // after force restart, skip packages until after the package that caused the restart. - { - // After restart we need to finish the dependency registration for our package so allow the package - // to go present. - if (CSTR_EQUAL == ::CompareStringW(LOCALE_NEUTRAL, 0, wzPackageId, -1, m_sczAfterForcedRestartPackage, -1)) - { - // Do not allow a repair because that could put us in a perpetual restart loop. - if (BOOTSTRAPPER_REQUEST_STATE_REPAIR == *pRequestState) - { - *pRequestState = BOOTSTRAPPER_REQUEST_STATE_PRESENT; - } - - ReleaseNullStr(m_sczAfterForcedRestartPackage); // no more skipping now. - } - else // not the matching package, so skip it. - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Skipping package: %ls, after restart because it was applied before the restart.", wzPackageId); - - *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE; - } - } - - return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel); - } - - - virtual STDMETHODIMP OnPlanMsiPackage( - __in_z LPCWSTR wzPackageId, - __in BOOL fExecute, - __in BOOTSTRAPPER_ACTION_STATE action, - __inout BOOL* pfCancel, - __inout BURN_MSI_PROPERTY* pActionMsiProperty, - __inout INSTALLUILEVEL* pUiLevel, - __inout BOOL* pfDisableExternalUiHandler - ) - { - HRESULT hr = S_OK; - WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; - BAL_INFO_PACKAGE* pPackage = NULL; - BOOL fShowInternalUI = FALSE; - INSTALLUILEVEL uiLevel = INSTALLUILEVEL_NOCHANGE; - - switch (m_command.display) - { - case BOOTSTRAPPER_DISPLAY_FULL: - uiLevel = INSTALLUILEVEL_FULL; - break; - - case BOOTSTRAPPER_DISPLAY_PASSIVE: - uiLevel = INSTALLUILEVEL_REDUCED; - break; - } - - if (INSTALLUILEVEL_NOCHANGE != uiLevel) - { - hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); - if (SUCCEEDED(hr) && pPackage->sczDisplayInternalUICondition) - { - hr = BalEvaluateCondition(pPackage->sczDisplayInternalUICondition, &fShowInternalUI); - BalExitOnFailure(hr, "Failed to evaluate condition for package '%ls': %ls", wzPackageId, pPackage->sczDisplayInternalUICondition); - - if (fShowInternalUI) - { - *pUiLevel = uiLevel; - } - } - } - - LExit: - return __super::OnPlanMsiPackage(wzPackageId, fExecute, action, pfCancel, pActionMsiProperty, pUiLevel, pfDisableExternalUiHandler); - } - - - virtual STDMETHODIMP OnPlanComplete( - __in HRESULT hrStatus - ) - { - HRESULT hr = S_OK; - - if (m_fPrereq) - { - m_fPrereqAlreadyInstalled = TRUE; - - // Now that we've planned the packages, we can focus on the prerequisite packages that are supposed to be installed. - for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) - { - BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i]; - WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast(pPackage->pvCustomData); - if (pPackage->fPrereqPackage && pPackageInfo && !pPackageInfo->fWasAlreadyInstalled && pPackageInfo->fPlannedToBeInstalled) - { - m_fPrereqAlreadyInstalled = FALSE; - break; - } - } - } - - SetState(WIXSTDBA_STATE_PLANNED, hrStatus); - - if (SUCCEEDED(hrStatus)) - { - ::PostMessageW(m_hWnd, WM_WIXSTDBA_APPLY_PACKAGES, 0, 0); - } - - m_fStartedExecution = FALSE; - m_dwCalculatedCacheProgress = 0; - m_dwCalculatedExecuteProgress = 0; - - return hr; - } - - - virtual STDMETHODIMP OnPauseAutomaticUpdatesBegin( - ) - { - HRESULT hr = S_OK; - LOC_STRING* pLocString = NULL; - LPWSTR sczFormattedString = NULL; - LPCWSTR wz = NULL; - - hr = __super::OnPauseAutomaticUpdatesBegin(); - - LocGetString(m_pWixLoc, L"#(loc.PauseAutomaticUpdatesMessage)", &pLocString); - - if (pLocString) - { - BalFormatString(pLocString->wzText, &sczFormattedString); - } - - wz = sczFormattedString ? sczFormattedString : L"Pausing Windows automatic updates"; - - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); - - ReleaseStr(sczFormattedString); - return hr; - } - - - virtual STDMETHODIMP OnSystemRestorePointBegin( - ) - { - HRESULT hr = S_OK; - LOC_STRING* pLocString = NULL; - LPWSTR sczFormattedString = NULL; - LPCWSTR wz = NULL; - - hr = __super::OnSystemRestorePointBegin(); - - LocGetString(m_pWixLoc, L"#(loc.SystemRestorePointMessage)", &pLocString); - - if (pLocString) - { - BalFormatString(pLocString->wzText, &sczFormattedString); - } - - wz = sczFormattedString ? sczFormattedString : L"Creating system restore point"; - - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); - - ReleaseStr(sczFormattedString); - return hr; - } - - - virtual STDMETHODIMP OnCachePackageBegin( - __in_z LPCWSTR wzPackageId, - __in DWORD cCachePayloads, - __in DWORD64 dw64PackageCacheSize, - __inout BOOL* pfCancel - ) - { - if (wzPackageId && *wzPackageId) - { - BAL_INFO_PACKAGE* pPackage = NULL; - HRESULT hr = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); - LPCWSTR wz = (SUCCEEDED(hr) && pPackage->sczDisplayName) ? pPackage->sczDisplayName : wzPackageId; - - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, wz); - - // If something started executing, leave it in the overall progress text. - if (!m_fStartedExecution) - { - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); - } - } - - return __super::OnCachePackageBegin(wzPackageId, cCachePayloads, dw64PackageCacheSize, pfCancel); - } - - - virtual STDMETHODIMP OnCacheAcquireProgress( - __in_z LPCWSTR wzPackageOrContainerId, - __in_z_opt LPCWSTR wzPayloadId, - __in DWORD64 dw64Progress, - __in DWORD64 dw64Total, - __in DWORD dwOverallPercentage, - __inout BOOL* pfCancel - ) - { -#ifdef DEBUG - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCacheAcquireProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage); -#endif - - UpdateCacheProgress(dwOverallPercentage); - - return __super::OnCacheAcquireProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, pfCancel); - } - - - virtual STDMETHODIMP OnCacheContainerOrPayloadVerifyProgress( - __in_z LPCWSTR wzPackageOrContainerId, - __in_z_opt LPCWSTR wzPayloadId, - __in DWORD64 dw64Progress, - __in DWORD64 dw64Total, - __in DWORD dwOverallPercentage, - __inout BOOL* pfCancel - ) - { -#ifdef DEBUG - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCacheContainerOrPayloadVerifyProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage); -#endif - - UpdateCacheProgress(dwOverallPercentage); - - return __super::OnCacheContainerOrPayloadVerifyProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, pfCancel); - } - - - virtual STDMETHODIMP OnCachePayloadExtractProgress( - __in_z LPCWSTR wzPackageOrContainerId, - __in_z_opt LPCWSTR wzPayloadId, - __in DWORD64 dw64Progress, - __in DWORD64 dw64Total, - __in DWORD dwOverallPercentage, - __inout BOOL* pfCancel - ) - { -#ifdef DEBUG - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCachePayloadExtractProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage); -#endif - - UpdateCacheProgress(dwOverallPercentage); - - return __super::OnCachePayloadExtractProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, pfCancel); - } - - - virtual STDMETHODIMP OnCacheVerifyProgress( - __in_z LPCWSTR wzPackageOrContainerId, - __in_z_opt LPCWSTR wzPayloadId, - __in DWORD64 dw64Progress, - __in DWORD64 dw64Total, - __in DWORD dwOverallPercentage, - __in BOOTSTRAPPER_CACHE_VERIFY_STEP verifyStep, - __inout BOOL* pfCancel - ) - { -#ifdef DEBUG - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnCacheVerifyProgress() - container/package: %ls, payload: %ls, progress: %I64u, total: %I64u, overall progress: %u%%, step: %u", wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, verifyStep); -#endif - - UpdateCacheProgress(dwOverallPercentage); - - return __super::OnCacheVerifyProgress(wzPackageOrContainerId, wzPayloadId, dw64Progress, dw64Total, dwOverallPercentage, verifyStep, pfCancel); - } - - - virtual STDMETHODIMP OnCacheAcquireComplete( - __in_z LPCWSTR wzPackageOrContainerId, - __in_z_opt LPCWSTR wzPayloadId, - __in HRESULT hrStatus, - __in BOOTSTRAPPER_CACHEACQUIRECOMPLETE_ACTION recommendation, - __inout BOOTSTRAPPER_CACHEACQUIRECOMPLETE_ACTION* pAction - ) - { - SetProgressState(hrStatus); - return __super::OnCacheAcquireComplete(wzPackageOrContainerId, wzPayloadId, hrStatus, recommendation, pAction); - } - - - virtual STDMETHODIMP OnCacheContainerOrPayloadVerifyComplete( - __in_z LPCWSTR wzPackageOrContainerId, - __in_z_opt LPCWSTR wzPayloadId, - __in HRESULT hrStatus - ) - { - SetProgressState(hrStatus); - return __super::OnCacheContainerOrPayloadVerifyComplete(wzPackageOrContainerId, wzPayloadId, hrStatus); - } - - - virtual STDMETHODIMP OnCachePayloadExtractComplete( - __in_z LPCWSTR wzPackageOrContainerId, - __in_z_opt LPCWSTR wzPayloadId, - __in HRESULT hrStatus - ) - { - SetProgressState(hrStatus); - return __super::OnCachePayloadExtractComplete(wzPackageOrContainerId, wzPayloadId, hrStatus); - } - - - virtual STDMETHODIMP OnCacheVerifyComplete( - __in_z LPCWSTR wzPackageId, - __in_z LPCWSTR wzPayloadId, - __in HRESULT hrStatus, - __in BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION recommendation, - __inout BOOTSTRAPPER_CACHEVERIFYCOMPLETE_ACTION* pAction - ) - { - SetProgressState(hrStatus); - return __super::OnCacheVerifyComplete(wzPackageId, wzPayloadId, hrStatus, recommendation, pAction); - } - - - virtual STDMETHODIMP OnCacheComplete( - __in HRESULT hrStatus - ) - { - UpdateCacheProgress(SUCCEEDED(hrStatus) ? 100 : 0); - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_PACKAGE_TEXT, L""); - SetState(WIXSTDBA_STATE_CACHED, S_OK); // we always return success here and let OnApplyComplete() deal with the error. - return __super::OnCacheComplete(hrStatus); - } - - - virtual STDMETHODIMP OnError( - __in BOOTSTRAPPER_ERROR_TYPE errorType, - __in LPCWSTR wzPackageId, - __in DWORD dwCode, - __in_z LPCWSTR wzError, - __in DWORD dwUIHint, - __in DWORD /*cData*/, - __in_ecount_z_opt(cData) LPCWSTR* /*rgwzData*/, - __in int /*nRecommendation*/, - __inout int* pResult - ) - { - HRESULT hr = S_OK; - int nResult = *pResult; - LPWSTR sczError = NULL; - - if (BOOTSTRAPPER_DISPLAY_EMBEDDED == m_command.display) - { - hr = m_pEngine->SendEmbeddedError(dwCode, wzError, dwUIHint, &nResult); - if (FAILED(hr)) - { - nResult = IDERROR; - } - } - else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display) - { - // If this is an authentication failure, let the engine try to handle it for us. - if (BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_SERVER == errorType || BOOTSTRAPPER_ERROR_TYPE_HTTP_AUTH_PROXY == errorType) - { - nResult = IDTRYAGAIN; - } - else // show a generic error message box. - { - BalRetryErrorOccurred(wzPackageId, dwCode); - - if (!m_fShowingInternalUiThisPackage) - { - // If no error message was provided, use the error code to try and get an error message. - if (!wzError || !*wzError || BOOTSTRAPPER_ERROR_TYPE_WINDOWS_INSTALLER != errorType) - { - hr = StrAllocFromError(&sczError, dwCode, NULL); - if (FAILED(hr) || !sczError || !*sczError) - { - // special case for ERROR_FAIL_NOACTION_REBOOT: use loc string for Windows XP - if (ERROR_FAIL_NOACTION_REBOOT == dwCode) - { - LOC_STRING* pLocString = NULL; - hr = LocGetString(m_pWixLoc, L"#(loc.ErrorFailNoActionReboot)", &pLocString); - if (SUCCEEDED(hr)) - { - StrAllocString(&sczError, pLocString->wzText, 0); - } - else - { - StrAllocFormatted(&sczError, L"0x%x", dwCode); - } - } - else - { - StrAllocFormatted(&sczError, L"0x%x", dwCode); - } - } - hr = S_OK; - } - - nResult = ::MessageBoxW(m_hWnd, sczError ? sczError : wzError, m_pTheme->sczCaption, dwUIHint); - } - } - - SetProgressState(HRESULT_FROM_WIN32(dwCode)); - } - else // just take note of the error code and let things continue. - { - BalRetryErrorOccurred(wzPackageId, dwCode); - } - - ReleaseStr(sczError); - *pResult = nResult; - return hr; - } - - - virtual STDMETHODIMP OnExecuteMsiMessage( - __in_z LPCWSTR wzPackageId, - __in INSTALLMESSAGE messageType, - __in DWORD dwUIHint, - __in_z LPCWSTR wzMessage, - __in DWORD cData, - __in_ecount_z_opt(cData) LPCWSTR* rgwzData, - __in int nRecommendation, - __inout int* pResult - ) - { -#ifdef DEBUG - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnExecuteMsiMessage() - package: %ls, message: %ls", wzPackageId, wzMessage); -#endif - if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display && (INSTALLMESSAGE_WARNING == messageType || INSTALLMESSAGE_USER == messageType)) - { - if (!m_fShowingInternalUiThisPackage) - { - int nResult = ::MessageBoxW(m_hWnd, wzMessage, m_pTheme->sczCaption, dwUIHint); - return nResult; - } - } - - if (INSTALLMESSAGE_ACTIONSTART == messageType) - { - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, wzMessage); - } - - return __super::OnExecuteMsiMessage(wzPackageId, messageType, dwUIHint, wzMessage, cData, rgwzData, nRecommendation, pResult); - } - - - virtual STDMETHODIMP OnProgress( - __in DWORD dwProgressPercentage, - __in DWORD dwOverallProgressPercentage, - __inout BOOL* pfCancel - ) - { - WCHAR wzProgress[5] = { }; - -#ifdef DEBUG - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnProgress() - progress: %u%%, overall progress: %u%%", dwProgressPercentage, dwOverallProgressPercentage); -#endif - - ::StringCchPrintfW(wzProgress, countof(wzProgress), L"%u%%", dwOverallProgressPercentage); - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_TEXT, wzProgress); - - ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_BAR, dwOverallProgressPercentage); - SetTaskbarButtonProgress(dwOverallProgressPercentage); - - return __super::OnProgress(dwProgressPercentage, dwOverallProgressPercentage, pfCancel); - } - - - virtual STDMETHODIMP OnExecutePackageBegin( - __in_z LPCWSTR wzPackageId, - __in BOOL fExecute, - __in BOOTSTRAPPER_ACTION_STATE action, - __in INSTALLUILEVEL uiLevel, - __in BOOL fDisableExternalUiHandler, - __inout BOOL* pfCancel - ) - { - HRESULT hr = S_OK; - LPWSTR sczFormattedString = NULL; - BOOL fShowingInternalUiThisPackage = FALSE; - - m_fStartedExecution = TRUE; - - if (wzPackageId && *wzPackageId) - { - BAL_INFO_PACKAGE* pPackage = NULL; - BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); - - LPCWSTR wz = wzPackageId; - if (pPackage) - { - LOC_STRING* pLocString = NULL; - - switch (pPackage->type) - { - case BAL_INFO_PACKAGE_TYPE_BUNDLE_ADDON: - LocGetString(m_pWixLoc, L"#(loc.ExecuteAddonRelatedBundleMessage)", &pLocString); - break; - - case BAL_INFO_PACKAGE_TYPE_BUNDLE_PATCH: - LocGetString(m_pWixLoc, L"#(loc.ExecutePatchRelatedBundleMessage)", &pLocString); - break; - - case BAL_INFO_PACKAGE_TYPE_BUNDLE_UPGRADE: - LocGetString(m_pWixLoc, L"#(loc.ExecuteUpgradeRelatedBundleMessage)", &pLocString); - break; - } - - if (pLocString) - { - // If the wix developer is showing a hidden variable in the UI, then obviously they don't care about keeping it safe - // so don't go down the rabbit hole of making sure that this is securely freed. - BalFormatString(pLocString->wzText, &sczFormattedString); - } - - wz = sczFormattedString ? sczFormattedString : pPackage->sczDisplayName ? pPackage->sczDisplayName : wzPackageId; - } - - fShowingInternalUiThisPackage = INSTALLUILEVEL_NONE != (INSTALLUILEVEL_NONE & uiLevel); - - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, wz); - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, wz); - } - - ::EnterCriticalSection(&m_csShowingInternalUiThisPackage); - m_fShowingInternalUiThisPackage = fShowingInternalUiThisPackage; - hr = __super::OnExecutePackageBegin(wzPackageId, fExecute, action, uiLevel, fDisableExternalUiHandler, pfCancel); - ::LeaveCriticalSection(&m_csShowingInternalUiThisPackage); - - ReleaseStr(sczFormattedString); - return hr; - } - - - virtual STDMETHODIMP OnExecuteProgress( - __in_z LPCWSTR wzPackageId, - __in DWORD dwProgressPercentage, - __in DWORD dwOverallProgressPercentage, - __inout BOOL* pfCancel - ) - { - WCHAR wzProgress[5] = { }; - -#ifdef DEBUG - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: OnExecuteProgress() - package: %ls, progress: %u%%, overall progress: %u%%", wzPackageId, dwProgressPercentage, dwOverallProgressPercentage); -#endif - - ::StringCchPrintfW(wzProgress, countof(wzProgress), L"%u%%", dwOverallProgressPercentage); - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_TEXT, wzProgress); - - ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_BAR, dwOverallProgressPercentage); - - m_dwCalculatedExecuteProgress = dwOverallProgressPercentage * (100 - WIXSTDBA_ACQUIRE_PERCENTAGE) / 100; - ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); - - SetTaskbarButtonProgress(m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); - - return __super::OnExecuteProgress(wzPackageId, dwProgressPercentage, dwOverallProgressPercentage, pfCancel); - } - - - virtual STDMETHODIMP OnExecutePackageComplete( - __in_z LPCWSTR wzPackageId, - __in HRESULT hrStatus, - __in BOOTSTRAPPER_APPLY_RESTART restart, - __in BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION recommendation, - __inout BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION* pAction - ) - { - HRESULT hr = S_OK; - SetProgressState(hrStatus); - - hr = __super::OnExecutePackageComplete(wzPackageId, hrStatus, restart, recommendation, pAction); - - WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; - BAL_INFO_PACKAGE* pPackage; - HRESULT hrPrereq = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage); - if (SUCCEEDED(hrPrereq) && pPackageInfo) - { - pPackageInfo->fSuccessfullyInstalled = SUCCEEDED(hrStatus); - - // If the prerequisite required a restart (any restart) then do an immediate - // restart to ensure that the bundle will get launched again post reboot. - if (m_fPrereq && pPackage->fPrereqPackage && BOOTSTRAPPER_APPLY_RESTART_NONE != restart) - { - *pAction = BOOTSTRAPPER_EXECUTEPACKAGECOMPLETE_ACTION_RESTART; - } - } - - return hr; - } - - - virtual STDMETHODIMP OnExecuteComplete( - __in HRESULT hrStatus - ) - { - HRESULT hr = S_OK; - - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_PACKAGE_TEXT, L""); - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_EXECUTE_PROGRESS_ACTIONDATA_TEXT, L""); - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_PROGRESS_PACKAGE_TEXT, L""); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, FALSE); // no more cancel. - m_fShowingInternalUiThisPackage = FALSE; - - SetState(WIXSTDBA_STATE_EXECUTED, S_OK); // we always return success here and let OnApplyComplete() deal with the error. - SetProgressState(hrStatus); - - return hr; - } - - - virtual STDMETHODIMP OnCacheAcquireResolving( - __in_z_opt LPCWSTR wzPackageOrContainerId, - __in_z_opt LPCWSTR wzPayloadId, - __in_z LPCWSTR* rgSearchPaths, - __in DWORD /*cSearchPaths*/, - __in BOOL /*fFoundLocal*/, - __in DWORD dwRecommendedSearchPath, - __in_z_opt LPCWSTR /*wzDownloadUrl*/, - __in_z_opt LPCWSTR /*wzPayloadContainerId*/, - __in BOOTSTRAPPER_CACHE_RESOLVE_OPERATION /*recommendation*/, - __inout DWORD* /*pdwChosenSearchPath*/, - __inout BOOTSTRAPPER_CACHE_RESOLVE_OPERATION* pAction, - __inout BOOL* pfCancel - ) - { - HRESULT hr = S_OK; - - if (BOOTSTRAPPER_CACHE_RESOLVE_NONE == *pAction && BOOTSTRAPPER_DISPLAY_FULL == m_command.display) // prompt to change the source location. - { - OPENFILENAMEW ofn = { }; - WCHAR wzFile[MAX_PATH] = { }; - - ::StringCchCopyW(wzFile, countof(wzFile), rgSearchPaths[dwRecommendedSearchPath]); - - ofn.lStructSize = sizeof(ofn); - ofn.hwndOwner = m_hWnd; - ofn.lpstrFile = wzFile; - ofn.nMaxFile = countof(wzFile); - ofn.lpstrFilter = L"All Files\0*.*\0"; - ofn.nFilterIndex = 1; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; - ofn.lpstrTitle = m_pTheme->sczCaption; - - if (::GetOpenFileNameW(&ofn)) - { - hr = m_pEngine->SetLocalSource(wzPackageOrContainerId, wzPayloadId, ofn.lpstrFile); - *pAction = BOOTSTRAPPER_CACHE_RESOLVE_RETRY; - } - else - { - *pfCancel = TRUE; - } - } - // else there's nothing more we can do in non-interactive mode - - *pfCancel |= CheckCanceled(); - return hr; - } - - - virtual STDMETHODIMP OnApplyComplete( - __in HRESULT hrStatus, - __in BOOTSTRAPPER_APPLY_RESTART restart, - __in BOOTSTRAPPER_APPLYCOMPLETE_ACTION recommendation, - __inout BOOTSTRAPPER_APPLYCOMPLETE_ACTION* pAction - ) - { - HRESULT hr = S_OK; - - __super::OnApplyComplete(hrStatus, restart, recommendation, pAction); - - m_restartResult = restart; // remember the restart result so we return the correct error code no matter what the user chooses to do in the UI. - - // If a restart was encountered and we are not suppressing restarts, then restart is required. - m_fRestartRequired = (BOOTSTRAPPER_APPLY_RESTART_NONE != restart && BOOTSTRAPPER_RESTART_NEVER < m_command.restart); - BalSetStringVariable(WIXSTDBA_VARIABLE_RESTART_REQUIRED, m_fRestartRequired ? L"1" : NULL, FALSE); - - // If a restart is required and we're not displaying a UI or we are not supposed to prompt for restart then allow the restart. - m_fAllowRestart = m_fRestartRequired && (BOOTSTRAPPER_DISPLAY_FULL > m_command.display || BOOTSTRAPPER_RESTART_PROMPT < m_command.restart); - - if (m_fPrereq) - { - m_fPrereqInstalled = TRUE; - BOOL fInstalledAPackage = FALSE; - - for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) - { - BAL_INFO_PACKAGE* pPackage = &m_Bundle.packages.rgPackages[i]; - WIXSTDBA_PACKAGE_INFO* pPackageInfo = reinterpret_cast(pPackage->pvCustomData); - if (pPackage->fPrereqPackage && pPackageInfo && pPackageInfo->fPlannedToBeInstalled && !pPackageInfo->fWasAlreadyInstalled) - { - if (pPackageInfo->fSuccessfullyInstalled) - { - fInstalledAPackage = TRUE; - } - else - { - m_fPrereqInstalled = FALSE; - break; - } - } - } - - m_fPrereqInstalled = m_fPrereqInstalled && fInstalledAPackage; - } - - // If we are showing UI, wait a beat before moving to the final screen. - if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) - { - ::Sleep(250); - } - - SetState(WIXSTDBA_STATE_APPLIED, hrStatus); - SetTaskbarButtonProgress(100); // show full progress bar, green, yellow, or red - - *pAction = BOOTSTRAPPER_APPLYCOMPLETE_ACTION_NONE; - - return hr; - } - - virtual STDMETHODIMP OnLaunchApprovedExeComplete( - __in HRESULT hrStatus, - __in DWORD /*processId*/ - ) - { - HRESULT hr = S_OK; - - if (HRESULT_FROM_WIN32(ERROR_ACCESS_DENIED) == hrStatus) - { - //try with ShelExec next time - OnClickLaunchButton(); - } - else - { - ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); - } - - return hr; - } - - virtual STDMETHODIMP_(void) BAProcFallback( - __in BOOTSTRAPPER_APPLICATION_MESSAGE message, - __in const LPVOID pvArgs, - __inout LPVOID pvResults, - __inout HRESULT* phr, - __in_opt LPVOID /*pvContext*/ - ) - { - if (!m_pfnBAFunctionsProc || FAILED(*phr)) - { - return; - } - - // Always log before and after so we don't get blamed when BAFunctions changes something. - switch (message) - { - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTBEGIN: - OnDetectBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTCOMPLETE: - OnDetectCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANBEGIN: - OnPlanBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANCOMPLETE: - OnPlanCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSTARTUP: // BAFunctions is loaded during this event on a separate thread so it's not possible to forward it. - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSHUTDOWN: - OnShutdownFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMSHUTDOWN: - OnSystemShutdownFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE: - OnDetectForwardCompatibleBundleFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATEBEGIN: - OnDetectUpdateBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATE: - OnDetectUpdateFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTUPDATECOMPLETE: - OnDetectUpdateCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDBUNDLE: - OnDetectRelatedBundleFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGEBEGIN: - OnDetectPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE: - OnDetectRelatedMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET: - OnDetectPatchTargetFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE: - OnDetectMsiFeatureFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPACKAGECOMPLETE: - OnDetectPackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANRELATEDBUNDLE: - OnPlanRelatedBundleFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN: - OnPlanPackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET: - OnPlanPatchTargetFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE: - OnPlanMsiFeatureFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGECOMPLETE: - OnPlanPackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYBEGIN: - OnApplyBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONELEVATEBEGIN: - OnElevateBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONELEVATECOMPLETE: - OnElevateCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPROGRESS: - OnProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONERROR: - OnErrorFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONREGISTERBEGIN: - OnRegisterBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONREGISTERCOMPLETE: - OnRegisterCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEBEGIN: - OnCacheBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGEBEGIN: - OnCachePackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIREBEGIN: - OnCacheAcquireBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIREPROGRESS: - OnCacheAcquireProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIRERESOLVING: - OnCacheAcquireResolvingFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIRECOMPLETE: - OnCacheAcquireCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEVERIFYBEGIN: - OnCacheVerifyBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEVERIFYCOMPLETE: - OnCacheVerifyCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPACKAGECOMPLETE: - OnCachePackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECOMPLETE: - OnCacheCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEBEGIN: - OnExecuteBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPACKAGEBEGIN: - OnExecutePackageBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPATCHTARGET: - OnExecutePatchTargetFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPROGRESS: - OnExecuteProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEMSIMESSAGE: - OnExecuteMsiMessageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEFILESINUSE: - OnExecuteFilesInUseFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTEPACKAGECOMPLETE: - OnExecutePackageCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONEXECUTECOMPLETE: - OnExecuteCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONUNREGISTERBEGIN: - OnUnregisterBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONUNREGISTERCOMPLETE: - OnUnregisterCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONAPPLYCOMPLETE: - OnApplyCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONLAUNCHAPPROVEDEXEBEGIN: - OnLaunchApprovedExeBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONLAUNCHAPPROVEDEXECOMPLETE: - OnLaunchApprovedExeCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIPACKAGE: - OnPlanMsiPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONBEGINMSITRANSACTIONBEGIN: - OnBeginMsiTransactionBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONBEGINMSITRANSACTIONCOMPLETE: - OnBeginMsiTransactionCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCOMMITMSITRANSACTIONBEGIN: - OnCommitMsiTransactionBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCOMMITMSITRANSACTIONCOMPLETE: - OnCommitMsiTransactionCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONROLLBACKMSITRANSACTIONBEGIN: - OnRollbackMsiTransactionBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONROLLBACKMSITRANSACTIONCOMPLETE: - OnRollbackMsiTransactionCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPAUSEAUTOMATICUPDATESBEGIN: - OnPauseAutomaticUpdatesBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPAUSEAUTOMATICUPDATESCOMPLETE: - OnPauseAutomaticUpdatesCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN: - OnSystemRestorePointBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE: - OnSystemRestorePointCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDPACKAGE: - OnPlannedPackageFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEVERIFYPROGRESS: - OnCacheVerifyProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYBEGIN: - OnCacheContainerOrPayloadVerifyBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE: - OnCacheContainerOrPayloadVerifyCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS: - OnCacheContainerOrPayloadVerifyProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTBEGIN: - OnCachePayloadExtractBeginFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTCOMPLETE: - OnCachePayloadExtractCompleteFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEPAYLOADEXTRACTPROGRESS: - OnCachePayloadExtractProgressFallback(reinterpret_cast(pvArgs), reinterpret_cast(pvResults)); - break; - default: -#ifdef DEBUG - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message); -#endif - m_pfnBAFunctionsProc((BA_FUNCTIONS_MESSAGE)message, pvArgs, pvResults, m_pvBAFunctionsProcContext); - break; - } - } - - -private: // privates - void OnDetectBeginFallback( - __in BA_ONDETECTBEGIN_ARGS* pArgs, - __inout BA_ONDETECTBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectCompleteFallback( - __in BA_ONDETECTCOMPLETE_ARGS* pArgs, - __inout BA_ONDETECTCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnPlanBeginFallback( - __in BA_ONPLANBEGIN_ARGS* pArgs, - __inout BA_ONPLANBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnPlanCompleteFallback( - __in BA_ONPLANCOMPLETE_ARGS* pArgs, - __inout BA_ONPLANCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnShutdownFallback( - __in BA_ONSHUTDOWN_ARGS* pArgs, - __inout BA_ONSHUTDOWN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnSystemShutdownFallback( - __in BA_ONSYSTEMSHUTDOWN_ARGS* pArgs, - __inout BA_ONSYSTEMSHUTDOWN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMSHUTDOWN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectForwardCompatibleBundleFallback( - __in BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs, - __inout BA_ONDETECTFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTFORWARDCOMPATIBLEBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectUpdateBeginFallback( - __in BA_ONDETECTUPDATEBEGIN_ARGS* pArgs, - __inout BA_ONDETECTUPDATEBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTUPDATEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectUpdateFallback( - __in BA_ONDETECTUPDATE_ARGS* pArgs, - __inout BA_ONDETECTUPDATE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTUPDATE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectUpdateCompleteFallback( - __in BA_ONDETECTUPDATECOMPLETE_ARGS* pArgs, - __inout BA_ONDETECTUPDATECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTUPDATECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectRelatedBundleFallback( - __in BA_ONDETECTRELATEDBUNDLE_ARGS* pArgs, - __inout BA_ONDETECTRELATEDBUNDLE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectPackageBeginFallback( - __in BA_ONDETECTPACKAGEBEGIN_ARGS* pArgs, - __inout BA_ONDETECTPACKAGEBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectRelatedMsiPackageFallback( - __in BA_ONDETECTRELATEDMSIPACKAGE_ARGS* pArgs, - __inout BA_ONDETECTRELATEDMSIPACKAGE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectPatchTargetFallback( - __in BA_ONDETECTPATCHTARGET_ARGS* pArgs, - __inout BA_ONDETECTPATCHTARGET_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectMsiFeatureFallback( - __in BA_ONDETECTMSIFEATURE_ARGS* pArgs, - __inout BA_ONDETECTMSIFEATURE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTMSIFEATURE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnDetectPackageCompleteFallback( - __in BA_ONDETECTPACKAGECOMPLETE_ARGS* pArgs, - __inout BA_ONDETECTPACKAGECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnPlanRelatedBundleFallback( - __in BA_ONPLANRELATEDBUNDLE_ARGS* pArgs, - __inout BA_ONPLANRELATEDBUNDLE_RESULTS* pResults - ) - { - BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANRELATEDBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); - BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE, m_hModule, pArgs->wzBundleId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); - } - - void OnPlanPackageBeginFallback( - __in BA_ONPLANPACKAGEBEGIN_ARGS* pArgs, - __inout BA_ONPLANPACKAGEBEGIN_RESULTS* pResults - ) - { - BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_PACKAGE, m_hModule, pArgs->wzPackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); - } - - void OnPlanPatchTargetFallback( - __in BA_ONPLANPATCHTARGET_ARGS* pArgs, - __inout BA_ONPLANPATCHTARGET_RESULTS* pResults - ) - { - BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState; - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext); - BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, pArgs->wzProductCode, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState)); - } - - void OnPlanMsiFeatureFallback( - __in BA_ONPLANMSIFEATURE_ARGS* pArgs, - __inout BA_ONPLANMSIFEATURE_RESULTS* pResults - ) - { - BOOTSTRAPPER_FEATURE_STATE requestedState = pResults->requestedState; - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANMSIFEATURE, pArgs, pResults, m_pvBAFunctionsProcContext); - BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_MSI_FEATURE, m_hModule, pArgs->wzPackageId, pArgs->wzFeatureId, LoggingMsiFeatureStateToString(requestedState), LoggingMsiFeatureStateToString(pResults->requestedState)); - } - - void OnPlanPackageCompleteFallback( - __in BA_ONPLANPACKAGECOMPLETE_ARGS* pArgs, - __inout BA_ONPLANPACKAGECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnPlannedPackageFallback( - __in BA_ONPLANNEDPACKAGE_ARGS* pArgs, - __inout BA_ONPLANNEDPACKAGE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANNEDPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnApplyBeginFallback( - __in BA_ONAPPLYBEGIN_ARGS* pArgs, - __inout BA_ONAPPLYBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONAPPLYBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnElevateBeginFallback( - __in BA_ONELEVATEBEGIN_ARGS* pArgs, - __inout BA_ONELEVATEBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONELEVATEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnElevateCompleteFallback( - __in BA_ONELEVATECOMPLETE_ARGS* pArgs, - __inout BA_ONELEVATECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONELEVATECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnProgressFallback( - __in BA_ONPROGRESS_ARGS* pArgs, - __inout BA_ONPROGRESS_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnErrorFallback( - __in BA_ONERROR_ARGS* pArgs, - __inout BA_ONERROR_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONERROR, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnRegisterBeginFallback( - __in BA_ONREGISTERBEGIN_ARGS* pArgs, - __inout BA_ONREGISTERBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONREGISTERBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnRegisterCompleteFallback( - __in BA_ONREGISTERCOMPLETE_ARGS* pArgs, - __inout BA_ONREGISTERCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONREGISTERCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheBeginFallback( - __in BA_ONCACHEBEGIN_ARGS* pArgs, - __inout BA_ONCACHEBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCachePackageBeginFallback( - __in BA_ONCACHEPACKAGEBEGIN_ARGS* pArgs, - __inout BA_ONCACHEPACKAGEBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheAcquireBeginFallback( - __in BA_ONCACHEACQUIREBEGIN_ARGS* pArgs, - __inout BA_ONCACHEACQUIREBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIREBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheAcquireProgressFallback( - __in BA_ONCACHEACQUIREPROGRESS_ARGS* pArgs, - __inout BA_ONCACHEACQUIREPROGRESS_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIREPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheAcquireResolvingFallback( - __in BA_ONCACHEACQUIRERESOLVING_ARGS* pArgs, - __inout BA_ONCACHEACQUIRERESOLVING_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIRERESOLVING, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheAcquireCompleteFallback( - __in BA_ONCACHEACQUIRECOMPLETE_ARGS* pArgs, - __inout BA_ONCACHEACQUIRECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIRECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheVerifyBeginFallback( - __in BA_ONCACHEVERIFYBEGIN_ARGS* pArgs, - __inout BA_ONCACHEVERIFYBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEVERIFYBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheVerifyCompleteFallback( - __in BA_ONCACHEVERIFYCOMPLETE_ARGS* pArgs, - __inout BA_ONCACHEVERIFYCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEVERIFYCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCachePackageCompleteFallback( - __in BA_ONCACHEPACKAGECOMPLETE_ARGS* pArgs, - __inout BA_ONCACHEPACKAGECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheCompleteFallback( - __in BA_ONCACHECOMPLETE_ARGS* pArgs, - __inout BA_ONCACHECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnExecuteBeginFallback( - __in BA_ONEXECUTEBEGIN_ARGS* pArgs, - __inout BA_ONEXECUTEBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnExecutePackageBeginFallback( - __in BA_ONEXECUTEPACKAGEBEGIN_ARGS* pArgs, - __inout BA_ONEXECUTEPACKAGEBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPACKAGEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnExecutePatchTargetFallback( - __in BA_ONEXECUTEPATCHTARGET_ARGS* pArgs, - __inout BA_ONEXECUTEPATCHTARGET_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnExecuteProgressFallback( - __in BA_ONEXECUTEPROGRESS_ARGS* pArgs, - __inout BA_ONEXECUTEPROGRESS_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnExecuteMsiMessageFallback( - __in BA_ONEXECUTEMSIMESSAGE_ARGS* pArgs, - __inout BA_ONEXECUTEMSIMESSAGE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEMSIMESSAGE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnExecuteFilesInUseFallback( - __in BA_ONEXECUTEFILESINUSE_ARGS* pArgs, - __inout BA_ONEXECUTEFILESINUSE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEFILESINUSE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnExecutePackageCompleteFallback( - __in BA_ONEXECUTEPACKAGECOMPLETE_ARGS* pArgs, - __inout BA_ONEXECUTEPACKAGECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTEPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnExecuteCompleteFallback( - __in BA_ONEXECUTECOMPLETE_ARGS* pArgs, - __inout BA_ONEXECUTECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONEXECUTECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnUnregisterBeginFallback( - __in BA_ONUNREGISTERBEGIN_ARGS* pArgs, - __inout BA_ONUNREGISTERBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONUNREGISTERBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnUnregisterCompleteFallback( - __in BA_ONUNREGISTERCOMPLETE_ARGS* pArgs, - __inout BA_ONUNREGISTERCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONUNREGISTERCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnApplyCompleteFallback( - __in BA_ONAPPLYCOMPLETE_ARGS* pArgs, - __inout BA_ONAPPLYCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONAPPLYCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnLaunchApprovedExeBeginFallback( - __in BA_ONLAUNCHAPPROVEDEXEBEGIN_ARGS* pArgs, - __inout BA_ONLAUNCHAPPROVEDEXEBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONLAUNCHAPPROVEDEXEBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnLaunchApprovedExeCompleteFallback( - __in BA_ONLAUNCHAPPROVEDEXECOMPLETE_ARGS* pArgs, - __inout BA_ONLAUNCHAPPROVEDEXECOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONLAUNCHAPPROVEDEXECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnPlanMsiPackageFallback( - __in BA_ONPLANMSIPACKAGE_ARGS* pArgs, - __inout BA_ONPLANMSIPACKAGE_RESULTS* pResults - ) - { - BURN_MSI_PROPERTY actionMsiProperty = pResults->actionMsiProperty; - INSTALLUILEVEL uiLevel = pResults->uiLevel; - BOOL fDisableExternalUiHandler = pResults->fDisableExternalUiHandler; - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext); - BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, actionMsiProperty, uiLevel, fDisableExternalUiHandler ? "yes" : "no", pResults->actionMsiProperty, pResults->uiLevel, pResults->fDisableExternalUiHandler ? "yes" : "no"); - } - - void OnBeginMsiTransactionBeginFallback( - __in BA_ONBEGINMSITRANSACTIONBEGIN_ARGS* pArgs, - __inout BA_ONBEGINMSITRANSACTIONBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONBEGINMSITRANSACTIONBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnBeginMsiTransactionCompleteFallback( - __in BA_ONBEGINMSITRANSACTIONCOMPLETE_ARGS* pArgs, - __inout BA_ONBEGINMSITRANSACTIONCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONBEGINMSITRANSACTIONCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCommitMsiTransactionBeginFallback( - __in BA_ONCOMMITMSITRANSACTIONBEGIN_ARGS* pArgs, - __inout BA_ONCOMMITMSITRANSACTIONBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCOMMITMSITRANSACTIONBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCommitMsiTransactionCompleteFallback( - __in BA_ONCOMMITMSITRANSACTIONCOMPLETE_ARGS* pArgs, - __inout BA_ONCOMMITMSITRANSACTIONCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCOMMITMSITRANSACTIONCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnRollbackMsiTransactionBeginFallback( - __in BA_ONROLLBACKMSITRANSACTIONBEGIN_ARGS* pArgs, - __inout BA_ONROLLBACKMSITRANSACTIONBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONROLLBACKMSITRANSACTIONBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnRollbackMsiTransactionCompleteFallback( - __in BA_ONROLLBACKMSITRANSACTIONCOMPLETE_ARGS* pArgs, - __inout BA_ONROLLBACKMSITRANSACTIONCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONROLLBACKMSITRANSACTIONCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnPauseAutomaticUpdatesBeginFallback( - __in BA_ONPAUSEAUTOMATICUPDATESBEGIN_ARGS* pArgs, - __inout BA_ONPAUSEAUTOMATICUPDATESBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPAUSEAUTOMATICUPDATESBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnPauseAutomaticUpdatesCompleteFallback( - __in BA_ONPAUSEAUTOMATICUPDATESCOMPLETE_ARGS* pArgs, - __inout BA_ONPAUSEAUTOMATICUPDATESCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPAUSEAUTOMATICUPDATESCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnSystemRestorePointBeginFallback( - __in BA_ONSYSTEMRESTOREPOINTBEGIN_ARGS* pArgs, - __inout BA_ONSYSTEMRESTOREPOINTBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMRESTOREPOINTBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnSystemRestorePointCompleteFallback( - __in BA_ONSYSTEMRESTOREPOINTCOMPLETE_ARGS* pArgs, - __inout BA_ONSYSTEMRESTOREPOINTCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnPlanForwardCompatibleBundleFallback( - __in BA_ONPLANFORWARDCOMPATIBLEBUNDLE_ARGS* pArgs, - __inout BA_ONPLANFORWARDCOMPATIBLEBUNDLE_RESULTS* pResults - ) - { - BOOL fIgnoreBundle = pResults->fIgnoreBundle; - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANFORWARDCOMPATIBLEBUNDLE, pArgs, pResults, m_pvBAFunctionsProcContext); - BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE, m_hModule, pArgs->wzBundleId, fIgnoreBundle ? "ignore" : "enable", pResults->fIgnoreBundle ? "ignore" : "enable"); - } - - void OnCacheVerifyProgressFallback( - __in BA_ONCACHEVERIFYPROGRESS_ARGS* pArgs, - __inout BA_ONCACHEVERIFYPROGRESS_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEVERIFYPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheContainerOrPayloadVerifyBeginFallback( - __in BA_ONCACHECONTAINERORPAYLOADVERIFYBEGIN_ARGS* pArgs, - __inout BA_ONCACHECONTAINERORPAYLOADVERIFYBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheContainerOrPayloadVerifyCompleteFallback( - __in BA_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE_ARGS* pArgs, - __inout BA_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCacheContainerOrPayloadVerifyProgressFallback( - __in BA_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS_ARGS* pArgs, - __inout BA_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHECONTAINERORPAYLOADVERIFYPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCachePayloadExtractBeginFallback( - __in BA_ONCACHEPAYLOADEXTRACTBEGIN_ARGS* pArgs, - __inout BA_ONCACHEPAYLOADEXTRACTBEGIN_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPAYLOADEXTRACTBEGIN, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCachePayloadExtractCompleteFallback( - __in BA_ONCACHEPAYLOADEXTRACTCOMPLETE_ARGS* pArgs, - __inout BA_ONCACHEPAYLOADEXTRACTCOMPLETE_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPAYLOADEXTRACTCOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - void OnCachePayloadExtractProgressFallback( - __in BA_ONCACHEPAYLOADEXTRACTPROGRESS_ARGS* pArgs, - __inout BA_ONCACHEPAYLOADEXTRACTPROGRESS_RESULTS* pResults - ) - { - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEPAYLOADEXTRACTPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext); - } - - // - // UiThreadProc - entrypoint for UI thread. - // - static DWORD WINAPI UiThreadProc( - __in LPVOID pvContext - ) - { - HRESULT hr = S_OK; - CWixStandardBootstrapperApplication* pThis = (CWixStandardBootstrapperApplication*)pvContext; - BOOL fComInitialized = FALSE; - BOOL fRet = FALSE; - MSG msg = { }; - - // Initialize COM and theme. - hr = ::CoInitialize(NULL); - BalExitOnFailure(hr, "Failed to initialize COM."); - fComInitialized = TRUE; - - hr = ThemeInitialize(pThis->m_hModule); - BalExitOnFailure(hr, "Failed to initialize theme manager."); - - hr = pThis->InitializeData(); - BalExitOnFailure(hr, "Failed to initialize data in bootstrapper application."); - - // Create main window. - pThis->InitializeTaskbarButton(); - hr = pThis->CreateMainWindow(); - BalExitOnFailure(hr, "Failed to create main window."); - - if (FAILED(pThis->m_hrFinal)) - { - pThis->SetState(WIXSTDBA_STATE_FAILED, hr); - ::PostMessageW(pThis->m_hWnd, WM_WIXSTDBA_SHOW_FAILURE, 0, 0); - } - else - { - // Okay, we're ready for packages now. - pThis->SetState(WIXSTDBA_STATE_INITIALIZED, hr); - ::PostMessageW(pThis->m_hWnd, BOOTSTRAPPER_ACTION_HELP == pThis->m_command.action ? WM_WIXSTDBA_SHOW_HELP : WM_WIXSTDBA_DETECT_PACKAGES, 0, 0); - } - - // message pump - while (0 != (fRet = ::GetMessageW(&msg, NULL, 0, 0))) - { - if (-1 == fRet) - { - hr = E_UNEXPECTED; - BalExitOnFailure(hr, "Unexpected return value from message pump."); - } - else if (!ThemeHandleKeyboardMessage(pThis->m_pTheme, msg.hwnd, &msg)) - { - ::TranslateMessage(&msg); - ::DispatchMessageW(&msg); - } - } - - // Succeeded thus far, check to see if anything went wrong while actually - // executing changes. - if (FAILED(pThis->m_hrFinal)) - { - hr = pThis->m_hrFinal; - } - else if (pThis->CheckCanceled()) - { - hr = HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT); - } - - LExit: - // destroy main window - pThis->DestroyMainWindow(); - pThis->UninitializeTaskbarButton(); - - // initiate engine shutdown - DWORD dwQuit = HRESULT_CODE(hr); - if (BOOTSTRAPPER_APPLY_RESTART_INITIATED == pThis->m_restartResult) - { - dwQuit = ERROR_SUCCESS_REBOOT_INITIATED; - } - else if (BOOTSTRAPPER_APPLY_RESTART_REQUIRED == pThis->m_restartResult) - { - dwQuit = ERROR_SUCCESS_REBOOT_REQUIRED; - } - pThis->m_pEngine->Quit(dwQuit); - - ReleaseTheme(pThis->m_pTheme); - ThemeUninitialize(); - - // uninitialize COM - if (fComInitialized) - { - ::CoUninitialize(); - } - - return hr; - } - - - // - // InitializeData - initializes all the package and prerequisite information. - // - HRESULT InitializeData() - { - HRESULT hr = S_OK; - LPWSTR sczModulePath = NULL; - IXMLDOMDocument *pixdManifest = NULL; - - hr = BalManifestLoad(m_hModule, &pixdManifest); - BalExitOnFailure(hr, "Failed to load bootstrapper application manifest."); - - hr = ParseOverridableVariablesFromXml(pixdManifest); - BalExitOnFailure(hr, "Failed to read overridable variables."); - - hr = ProcessCommandLine(&m_sczLanguage); - ExitOnFailure(hr, "Unknown commandline parameters."); - - hr = PathRelativeToModule(&sczModulePath, NULL, m_hModule); - BalExitOnFailure(hr, "Failed to get module path."); - - hr = LoadLocalization(sczModulePath, m_sczLanguage); - ExitOnFailure(hr, "Failed to load localization."); - - hr = LoadTheme(sczModulePath, m_sczLanguage); - ExitOnFailure(hr, "Failed to load theme."); - - hr = BalInfoParseFromXml(&m_Bundle, pixdManifest); - BalExitOnFailure(hr, "Failed to load bundle information."); - - hr = BalConditionsParseFromXml(&m_Conditions, pixdManifest, m_pWixLoc); - BalExitOnFailure(hr, "Failed to load conditions from XML."); - - hr = LoadBAFunctions(pixdManifest); - BalExitOnFailure(hr, "Failed to load bootstrapper functions."); - - GetBundleFileVersion(); - // don't fail if we couldn't get the version info; best-effort only - - hr = InitializePackageInfo(); - BalExitOnFailure(hr, "Failed to initialize wixstdba package information."); - - if (m_fPrereq) - { - hr = InitializePrerequisiteInformation(); - BalExitOnFailure(hr, "Failed to initialize prerequisite information."); - } - else - { - hr = ParseBootstrapperApplicationDataFromXml(pixdManifest); - BalExitOnFailure(hr, "Failed to read bootstrapper application data."); - } - - if (BOOTSTRAPPER_ACTION_CACHE == m_plannedAction) - { - if (m_fSupportCacheOnly) - { - // Doesn't make sense to prompt the user if cache only is requested. - if (BOOTSTRAPPER_DISPLAY_PASSIVE < m_command.display) - { - m_command.display = BOOTSTRAPPER_DISPLAY_PASSIVE; - } - - m_command.action = BOOTSTRAPPER_ACTION_CACHE; - } - else - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Ignoring attempt to only cache a bundle that does not explicitly support it."); - m_plannedAction = BOOTSTRAPPER_ACTION_UNKNOWN; - } - } - - LExit: - ReleaseObject(pixdManifest); - ReleaseStr(sczModulePath); - - return hr; - } - - - // - // ProcessCommandLine - process the provided command line arguments. - // - HRESULT ProcessCommandLine( - __inout LPWSTR* psczLanguage - ) - { - HRESULT hr = S_OK; - int argc = 0; - LPWSTR* argv = NULL; - LPWSTR sczVariableName = NULL; - LPWSTR sczVariableValue = NULL; - - if (m_command.wzCommandLine && *m_command.wzCommandLine) - { - hr = AppParseCommandLine(m_command.wzCommandLine, &argc, &argv); - ExitOnFailure(hr, "Failed to parse command line."); - - for (int i = 0; i < argc; ++i) - { - if (argv[i][0] == L'-' || argv[i][0] == L'/') - { - if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"lang", -1)) - { - if (i + 1 >= argc) - { - hr = E_INVALIDARG; - BalExitOnFailure(hr, "Must specify a language."); - } - - ++i; - - hr = StrAllocString(psczLanguage, &argv[i][0], 0); - BalExitOnFailure(hr, "Failed to copy language."); - } - } - else if (CSTR_EQUAL == ::CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, &argv[i][1], -1, L"cache", -1)) - { - m_plannedAction = BOOTSTRAPPER_ACTION_CACHE; - } - else if (m_sdOverridableVariables) - { - const wchar_t* pwc = wcschr(argv[i], L'='); - if (pwc) - { - hr = StrAllocString(&sczVariableName, argv[i], pwc - argv[i]); - BalExitOnFailure(hr, "Failed to copy variable name."); - - hr = DictKeyExists(m_sdOverridableVariables, sczVariableName); - if (E_NOTFOUND == hr) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Ignoring attempt to set non-overridable variable: '%ls'.", sczVariableName); - hr = S_OK; - continue; - } - ExitOnFailure(hr, "Failed to check the dictionary of overridable variables."); - - hr = StrAllocString(&sczVariableValue, ++pwc, 0); - BalExitOnFailure(hr, "Failed to copy variable value."); - - hr = m_pEngine->SetVariableString(sczVariableName, sczVariableValue, FALSE); - BalExitOnFailure(hr, "Failed to set variable."); - } - else - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "Ignoring unknown argument: %ls", argv[i]); - } - } - } - } - - LExit: - if (argv) - { - AppFreeCommandLineArgs(argv); - } - - ReleaseStr(sczVariableName); - ReleaseStr(sczVariableValue); - - return hr; - } - - HRESULT LoadLocalization( - __in_z LPCWSTR wzModulePath, - __in_z_opt LPCWSTR wzLanguage - ) - { - HRESULT hr = S_OK; - LPWSTR sczLocPath = NULL; - LPWSTR sczFormatted = NULL; - LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl"; - - // Find and load .wxl file. - hr = LocProbeForFile(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath); - BalExitOnFailure(hr, "Failed to probe for loc file: %ls in path: %ls", wzLocFileName, wzModulePath); - - hr = LocLoadFromFile(sczLocPath, &m_pWixLoc); - BalExitOnFailure(hr, "Failed to load loc file from path: %ls", sczLocPath); - - // Set WixStdBALanguageId to .wxl language id. - if (WIX_LOCALIZATION_LANGUAGE_NOT_SET != m_pWixLoc->dwLangId) - { - ::SetThreadLocale(m_pWixLoc->dwLangId); - - hr = m_pEngine->SetVariableNumeric(WIXSTDBA_VARIABLE_LANGUAGE_ID, m_pWixLoc->dwLangId); - BalExitOnFailure(hr, "Failed to set WixStdBALanguageId variable."); - } - - // Load ConfirmCancelMessage. - hr = StrAllocString(&m_sczConfirmCloseMessage, L"#(loc.ConfirmCancelMessage)", 0); - ExitOnFailure(hr, "Failed to initialize confirm message loc identifier."); - - hr = LocLocalizeString(m_pWixLoc, &m_sczConfirmCloseMessage); - BalExitOnFailure(hr, "Failed to localize confirm close message: %ls", m_sczConfirmCloseMessage); - - hr = BalFormatString(m_sczConfirmCloseMessage, &sczFormatted); - if (SUCCEEDED(hr)) - { - ReleaseStr(m_sczConfirmCloseMessage); - m_sczConfirmCloseMessage = sczFormatted; - sczFormatted = NULL; - } - - LExit: - ReleaseStr(sczFormatted); - ReleaseStr(sczLocPath); - - return hr; - } - - - HRESULT LoadTheme( - __in_z LPCWSTR wzModulePath, - __in_z_opt LPCWSTR wzLanguage - ) - { - HRESULT hr = S_OK; - LPWSTR sczThemePath = NULL; - LPCWSTR wzThemeFileName = m_fPrereq ? L"mbapreq.thm" : L"thm.xml"; - - hr = LocProbeForFile(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath); - BalExitOnFailure(hr, "Failed to probe for theme file: %ls in path: %ls", wzThemeFileName, wzModulePath); - - hr = ThemeLoadFromFile(sczThemePath, &m_pTheme); - BalExitOnFailure(hr, "Failed to load theme from path: %ls", sczThemePath); - - hr = ThemeRegisterVariableCallbacks(m_pTheme, EvaluateVariableConditionCallback, FormatVariableStringCallback, GetVariableNumericCallback, SetVariableNumericCallback, GetVariableStringCallback, SetVariableStringCallback, NULL); - BalExitOnFailure(hr, "Failed to register variable theme callbacks."); - - hr = ThemeLocalize(m_pTheme, m_pWixLoc); - BalExitOnFailure(hr, "Failed to localize theme: %ls", sczThemePath); - - LExit: - ReleaseStr(sczThemePath); - - return hr; - } - - - HRESULT ParseOverridableVariablesFromXml( - __in IXMLDOMDocument* pixdManifest - ) - { - HRESULT hr = S_OK; - IXMLDOMNode* pNode = NULL; - IXMLDOMNodeList* pNodes = NULL; - DWORD cNodes = 0; - LPWSTR scz = NULL; - - // Get the list of variables users can override on the command line. - hr = XmlSelectNodes(pixdManifest, L"/BootstrapperApplicationData/WixStdbaOverridableVariable", &pNodes); - if (S_FALSE == hr) - { - ExitFunction1(hr = S_OK); - } - ExitOnFailure(hr, "Failed to select overridable variable nodes."); - - hr = pNodes->get_length((long*)&cNodes); - ExitOnFailure(hr, "Failed to get overridable variable node count."); - - if (cNodes) - { - hr = DictCreateStringList(&m_sdOverridableVariables, 32, DICT_FLAG_NONE); - ExitOnFailure(hr, "Failed to create the string dictionary."); - - for (DWORD i = 0; i < cNodes; ++i) - { - hr = XmlNextElement(pNodes, &pNode, NULL); - ExitOnFailure(hr, "Failed to get next node."); - - // @Name - hr = XmlGetAttributeEx(pNode, L"Name", &scz); - ExitOnFailure(hr, "Failed to get @Name."); - - hr = DictAddKey(m_sdOverridableVariables, scz); - ExitOnFailure(hr, "Failed to add \"%ls\" to the string dictionary.", scz); - - // prepare next iteration - ReleaseNullObject(pNode); - } - } - - LExit: - ReleaseObject(pNode); - ReleaseObject(pNodes); - ReleaseStr(scz); - return hr; - } - - - HRESULT InitializePackageInfo() - { - HRESULT hr = S_OK; - BAL_INFO_PACKAGE* pPackage = NULL; - - for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) - { - pPackage = &m_Bundle.packages.rgPackages[i]; - - hr = InitializePackageInfoForPackage(pPackage); - BalExitOnFailure(hr, "Failed to initialize wixstdba package info for package: %ls.", pPackage->sczId); - } - - LExit: - return hr; - } - - - HRESULT InitializePackageInfoForPackage( - __in BAL_INFO_PACKAGE* pPackage - ) - { - HRESULT hr = S_OK; - - pPackage->pvCustomData = MemAlloc(sizeof(WIXSTDBA_PACKAGE_INFO), TRUE); - BalExitOnNull(pPackage->pvCustomData, hr, E_OUTOFMEMORY, "Failed to allocate memory for wixstdba package info."); - - LExit: - return hr; - } - - - HRESULT InitializePrerequisiteInformation() - { - HRESULT hr = S_OK; - BAL_INFO_PACKAGE* pPackage = NULL; - - for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) - { - pPackage = &m_Bundle.packages.rgPackages[i]; - if (!pPackage->fPrereqPackage) - { - continue; - } - - if (pPackage->sczPrereqLicenseFile) - { - if (m_sczLicenseFile) - { - hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); - BalExitOnFailure(hr, "More than one license file specified in prerequisite info."); - } - - hr = StrAllocString(&m_sczLicenseFile, pPackage->sczPrereqLicenseFile, 0); - BalExitOnFailure(hr, "Failed to copy license file location from prereq package."); - } - - if (pPackage->sczPrereqLicenseUrl) - { - if (m_sczLicenseUrl) - { - hr = HRESULT_FROM_WIN32(ERROR_INVALID_DATA); - BalExitOnFailure(hr, "More than one license URL specified in prerequisite info."); - } - - hr = StrAllocString(&m_sczLicenseUrl, pPackage->sczPrereqLicenseUrl, 0); - BalExitOnFailure(hr, "Failed to copy license URL from prereq package."); - } - } - - LExit: - return hr; - } - - - HRESULT ParseBootstrapperApplicationDataFromXml( - __in IXMLDOMDocument* pixdManifest - ) - { - HRESULT hr = S_OK; - IXMLDOMNode* pNode = NULL; - DWORD dwBool = 0; - - hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixStdbaInformation", &pNode); - if (S_FALSE == hr) - { - hr = E_INVALIDARG; - } - BalExitOnFailure(hr, "BootstrapperApplication.xml manifest is missing wixstdba information."); - - hr = XmlGetAttributeEx(pNode, L"LicenseFile", &m_sczLicenseFile); - if (E_NOTFOUND == hr) - { - hr = S_OK; - } - BalExitOnFailure(hr, "Failed to get license file."); - - hr = XmlGetAttributeEx(pNode, L"LicenseUrl", &m_sczLicenseUrl); - if (E_NOTFOUND == hr) - { - hr = S_OK; - } - BalExitOnFailure(hr, "Failed to get license URL."); - - ReleaseObject(pNode); - - hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixStdbaOptions", &pNode); - if (S_FALSE == hr) - { - ExitFunction1(hr = S_OK); - } - BalExitOnFailure(hr, "Failed to read wixstdba options from BootstrapperApplication.xml manifest."); - - hr = XmlGetAttributeNumber(pNode, L"SuppressOptionsUI", &dwBool); - if (S_FALSE == hr) - { - hr = S_OK; - } - else if (SUCCEEDED(hr) && dwBool) - { - hr = BalSetNumericVariable(WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI, 1); - BalExitOnFailure(hr, "Failed to set '%ls' variable.", WIXSTDBA_VARIABLE_SUPPRESS_OPTIONS_UI); - } - BalExitOnFailure(hr, "Failed to get SuppressOptionsUI value."); - - dwBool = 0; - hr = XmlGetAttributeNumber(pNode, L"SuppressDowngradeFailure", &dwBool); - if (S_FALSE == hr) - { - hr = S_OK; - } - else if (SUCCEEDED(hr)) - { - m_fSuppressDowngradeFailure = 0 < dwBool; - } - BalExitOnFailure(hr, "Failed to get SuppressDowngradeFailure value."); - - dwBool = 0; - hr = XmlGetAttributeNumber(pNode, L"SuppressRepair", &dwBool); - if (S_FALSE == hr) - { - hr = S_OK; - } - else if (SUCCEEDED(hr)) - { - m_fSuppressRepair = 0 < dwBool; - } - BalExitOnFailure(hr, "Failed to get SuppressRepair value."); - - hr = XmlGetAttributeNumber(pNode, L"ShowVersion", &dwBool); - if (S_FALSE == hr) - { - hr = S_OK; - } - else if (SUCCEEDED(hr) && dwBool) - { - hr = BalSetNumericVariable(WIXSTDBA_VARIABLE_SHOW_VERSION, 1); - BalExitOnFailure(hr, "Failed to set '%ls' variable.", WIXSTDBA_VARIABLE_SHOW_VERSION); - } - BalExitOnFailure(hr, "Failed to get ShowVersion value."); - - hr = XmlGetAttributeNumber(pNode, L"SupportCacheOnly", &dwBool); - if (S_FALSE == hr) - { - hr = S_OK; - } - else if (SUCCEEDED(hr)) - { - m_fSupportCacheOnly = 0 < dwBool; - } - BalExitOnFailure(hr, "Failed to get SupportCacheOnly value."); - - LExit: - ReleaseObject(pNode); - return hr; - } - - HRESULT GetPackageInfo( - __in_z LPCWSTR wzPackageId, - __out WIXSTDBA_PACKAGE_INFO** ppPackageInfo, - __out BAL_INFO_PACKAGE** ppPackage - ) - { - HRESULT hr = E_NOTFOUND; - WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL; - BAL_INFO_PACKAGE* pPackage = NULL; - - Assert(wzPackageId && *wzPackageId); - Assert(ppPackage); - Assert(ppPackageInfo); - - hr = BalInfoFindPackageById(&m_Bundle.packages, wzPackageId, &pPackage); - if (E_NOTFOUND != hr) - { - ExitOnFailure(hr, "Failed trying to find the requested package."); - - pPackageInfo = reinterpret_cast(pPackage->pvCustomData); - } - - *ppPackageInfo = pPackageInfo; - *ppPackage = pPackage; - - LExit: - return hr; - } - - - // - // Get the file version of the bootstrapper and record in bootstrapper log file - // - HRESULT GetBundleFileVersion() - { - HRESULT hr = S_OK; - ULARGE_INTEGER uliVersion = { }; - LPWSTR sczCurrentPath = NULL; - VERUTIL_VERSION* pVersion = NULL; - - hr = PathForCurrentProcess(&sczCurrentPath, NULL); - BalExitOnFailure(hr, "Failed to get bundle path."); - - hr = FileVersion(sczCurrentPath, &uliVersion.HighPart, &uliVersion.LowPart); - BalExitOnFailure(hr, "Failed to get bundle file version."); - - hr = VerVersionFromQword(uliVersion.QuadPart, &pVersion); - BalExitOnFailure(hr, "Failed to create bundle file version."); - - hr = m_pEngine->SetVariableVersion(WIXSTDBA_VARIABLE_BUNDLE_FILE_VERSION, pVersion->sczVersion); - BalExitOnFailure(hr, "Failed to set WixBundleFileVersion variable."); - - LExit: - ReleaseVerutilVersion(pVersion); - ReleaseStr(sczCurrentPath); - - return hr; - } - - - // - // CreateMainWindow - creates the main install window. - // - HRESULT CreateMainWindow() - { - HRESULT hr = S_OK; - HICON hIcon = reinterpret_cast(m_pTheme->hIcon); - WNDCLASSW wc = { }; - DWORD dwWindowStyle = 0; - int x = CW_USEDEFAULT; - int y = CW_USEDEFAULT; - POINT ptCursor = { }; - - // If the theme did not provide an icon, try using the icon from the bundle engine. - if (!hIcon) - { - HMODULE hBootstrapperEngine = ::GetModuleHandleW(NULL); - if (hBootstrapperEngine) - { - hIcon = ::LoadIconW(hBootstrapperEngine, MAKEINTRESOURCEW(1)); - } - } - - // Register the window class and create the window. - wc.lpfnWndProc = CWixStandardBootstrapperApplication::WndProc; - wc.hInstance = m_hModule; - wc.hIcon = hIcon; - wc.hCursor = ::LoadCursorW(NULL, (LPCWSTR)IDC_ARROW); - wc.hbrBackground = m_pTheme->rgFonts[m_pTheme->dwFontId].hBackground; - wc.lpszMenuName = NULL; - wc.lpszClassName = WIXSTDBA_WINDOW_CLASS; - if (!::RegisterClassW(&wc)) - { - ExitWithLastError(hr, "Failed to register window."); - } - - m_fRegistered = TRUE; - - // Calculate the window style based on the theme style and command display value. - dwWindowStyle = m_pTheme->dwStyle; - if (BOOTSTRAPPER_DISPLAY_NONE >= m_command.display) - { - dwWindowStyle &= ~WS_VISIBLE; - } - - // Don't show the window if there is a splash screen (it will be made visible when the splash screen is hidden) - if (::IsWindow(m_command.hwndSplashScreen)) - { - dwWindowStyle &= ~WS_VISIBLE; - } - - // Center the window on the monitor with the mouse. - if (::GetCursorPos(&ptCursor)) - { - x = ptCursor.x; - y = ptCursor.y; - } - - hr = ThemeCreateParentWindow(m_pTheme, 0, wc.lpszClassName, m_pTheme->sczCaption, dwWindowStyle, x, y, HWND_DESKTOP, m_hModule, this, THEME_WINDOW_INITIAL_POSITION_CENTER_MONITOR_FROM_COORDINATES, &m_hWnd); - ExitOnFailure(hr, "Failed to create window."); - - hr = S_OK; - - LExit: - return hr; - } - - - // - // InitializeTaskbarButton - initializes taskbar button for progress. - // - void InitializeTaskbarButton() - { - HRESULT hr = S_OK; - - hr = ::CoCreateInstance(CLSID_TaskbarList, NULL, CLSCTX_ALL, __uuidof(ITaskbarList3), reinterpret_cast(&m_pTaskbarList)); - if (REGDB_E_CLASSNOTREG == hr) // not supported before Windows 7 - { - ExitFunction1(hr = S_OK); - } - BalExitOnFailure(hr, "Failed to create ITaskbarList3. Continuing."); - - m_uTaskbarButtonCreatedMessage = ::RegisterWindowMessageW(L"TaskbarButtonCreated"); - BalExitOnNullWithLastError(m_uTaskbarButtonCreatedMessage, hr, "Failed to get TaskbarButtonCreated message. Continuing."); - - LExit: - return; - } - - // - // DestroyMainWindow - clean up all the window registration. - // - void DestroyMainWindow() - { - if (::IsWindow(m_hWnd)) - { - ::DestroyWindow(m_hWnd); - m_hWnd = NULL; - m_fTaskbarButtonOK = FALSE; - } - - if (m_fRegistered) - { - ::UnregisterClassW(WIXSTDBA_WINDOW_CLASS, m_hModule); - m_fRegistered = FALSE; - } - } - - - // - // UninitializeTaskbarButton - clean up the taskbar registration. - // - void UninitializeTaskbarButton() - { - m_fTaskbarButtonOK = FALSE; - ReleaseNullObject(m_pTaskbarList); - } - - - static LRESULT CallDefaultWndProc( - __in CWixStandardBootstrapperApplication* pBA, - __in HWND hWnd, - __in UINT uMsg, - __in WPARAM wParam, - __in LPARAM lParam - ) - { - LRESULT lres = NULL; - THEME* pTheme = NULL; - HRESULT hr = S_OK; - BA_FUNCTIONS_WNDPROC_ARGS wndProcArgs = { }; - BA_FUNCTIONS_WNDPROC_RESULTS wndProcResults = { }; - - if (pBA) - { - pTheme = pBA->m_pTheme; - - if (pBA->m_pfnBAFunctionsProc) - { - wndProcArgs.cbSize = sizeof(wndProcArgs); - wndProcArgs.pTheme = pTheme; - wndProcArgs.hWnd = hWnd; - wndProcArgs.uMsg = uMsg; - wndProcArgs.wParam = wParam; - wndProcArgs.lParam = lParam; - wndProcResults.cbSize = sizeof(wndProcResults); - - hr = pBA->m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_WNDPROC, &wndProcArgs, &wndProcResults, pBA->m_pvBAFunctionsProcContext); - if (E_NOTIMPL != hr) - { - lres = wndProcResults.lres; - ExitFunction(); - } - } - } - - lres = ThemeDefWindowProc(pTheme, hWnd, uMsg, wParam, lParam); - - LExit: - return lres; - } - - // - // WndProc - standard windows message handler. - // - static LRESULT CALLBACK WndProc( - __in HWND hWnd, - __in UINT uMsg, - __in WPARAM wParam, - __in LPARAM lParam - ) - { -#pragma warning(suppress:4312) - CWixStandardBootstrapperApplication* pBA = reinterpret_cast(::GetWindowLongPtrW(hWnd, GWLP_USERDATA)); - BOOL fCancel = FALSE; - - switch (uMsg) - { - case WM_NCCREATE: - { - LPCREATESTRUCT lpcs = reinterpret_cast(lParam); - pBA = reinterpret_cast(lpcs->lpCreateParams); -#pragma warning(suppress:4244) - ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, reinterpret_cast(pBA)); - } - break; - - case WM_NCDESTROY: - { - LRESULT lres = CallDefaultWndProc(pBA, hWnd, uMsg, wParam, lParam); - ::SetWindowLongPtrW(hWnd, GWLP_USERDATA, 0); - ::PostQuitMessage(0); - return lres; - } - - case WM_CREATE: - if (!pBA->OnCreate(hWnd)) - { - return -1; - } - break; - - case WM_QUERYENDSESSION: - fCancel = true; - pBA->OnSystemShutdown(static_cast(lParam), &fCancel); - return !fCancel; - - case WM_CLOSE: - // If the user chose not to close, do *not* let the default window proc handle the message. - if (!pBA->OnClose()) - { - return 0; - } - break; - - case WM_WIXSTDBA_SHOW_HELP: - pBA->OnShowHelp(); - return 0; - - case WM_WIXSTDBA_DETECT_PACKAGES: - pBA->OnDetect(); - return 0; - - case WM_WIXSTDBA_PLAN_PACKAGES: - pBA->OnPlan(static_cast(lParam)); - return 0; - - case WM_WIXSTDBA_APPLY_PACKAGES: - pBA->OnApply(); - return 0; - - case WM_WIXSTDBA_CHANGE_STATE: - pBA->OnChangeState(static_cast(lParam)); - return 0; - - case WM_WIXSTDBA_SHOW_FAILURE: - pBA->OnShowFailure(); - return 0; - - case WM_COMMAND: - switch (HIWORD(wParam)) - { - case BN_CLICKED: - switch (LOWORD(wParam)) - { - case WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX: - pBA->OnClickAcceptCheckbox(); - return 0; - - case WIXSTDBA_CONTROL_INSTALL_BUTTON: - pBA->OnClickInstallButton(); - return 0; - - case WIXSTDBA_CONTROL_REPAIR_BUTTON: - pBA->OnClickRepairButton(); - return 0; - - case WIXSTDBA_CONTROL_UNINSTALL_BUTTON: - pBA->OnClickUninstallButton(); - return 0; - - case WIXSTDBA_CONTROL_LAUNCH_BUTTON: - pBA->OnClickLaunchButton(); - return 0; - - case WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON: __fallthrough; - case WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON: - pBA->OnClickRestartButton(); - return 0; - - case WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON: - pBA->OnClickCloseButton(); - return 0; - } - break; - } - break; - - case WM_NOTIFY: - if (lParam) - { - LPNMHDR pnmhdr = reinterpret_cast(lParam); - switch (pnmhdr->code) - { - case NM_CLICK: __fallthrough; - case NM_RETURN: - switch (static_cast(pnmhdr->idFrom)) - { - case WIXSTDBA_CONTROL_EULA_LINK: - pBA->OnClickEulaLink(); - return 1; - case WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK: - pBA->OnClickLogFileLink(); - return 1; - } - } - } - break; - } - - if (pBA && pBA->m_pTaskbarList && uMsg == pBA->m_uTaskbarButtonCreatedMessage) - { - pBA->m_fTaskbarButtonOK = TRUE; - return 0; - } - - return CallDefaultWndProc(pBA, hWnd, uMsg, wParam, lParam); - } - - - // - // OnCreate - finishes loading the theme. - // - BOOL OnCreate( - __in HWND /*hWnd*/ - ) - { - HRESULT hr = S_OK; - LPWSTR sczLicenseFormatted = NULL; - LPWSTR sczLicensePath = NULL; - LPWSTR sczLicenseDirectory = NULL; - LPWSTR sczLicenseFilename = NULL; - BA_FUNCTIONS_ONTHEMELOADED_ARGS themeLoadedArgs = { }; - BA_FUNCTIONS_ONTHEMELOADED_RESULTS themeLoadedResults = { }; - - hr = ThemeLoadControls(m_pTheme, vrgInitControls, countof(vrgInitControls)); - BalExitOnFailure(hr, "Failed to load theme controls."); - - C_ASSERT(COUNT_WIXSTDBA_PAGE == countof(vrgwzPageNames)); - C_ASSERT(countof(m_rgdwPageIds) == countof(vrgwzPageNames)); - - ThemeGetPageIds(m_pTheme, vrgwzPageNames, m_rgdwPageIds, countof(m_rgdwPageIds)); - - // Load the RTF EULA control with text if the control exists. - if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT)) - { - hr = (m_sczLicenseFile && *m_sczLicenseFile) ? S_OK : E_INVALIDDATA; - if (SUCCEEDED(hr)) - { - hr = StrAllocString(&sczLicenseFormatted, m_sczLicenseFile, 0); - if (SUCCEEDED(hr)) - { - hr = LocLocalizeString(m_pWixLoc, &sczLicenseFormatted); - if (SUCCEEDED(hr)) - { - // Assume there is no hidden variables to be formatted - // so don't worry about securely freeing it. - hr = BalFormatString(sczLicenseFormatted, &sczLicenseFormatted); - if (SUCCEEDED(hr)) - { - hr = PathRelativeToModule(&sczLicensePath, sczLicenseFormatted, m_hModule); - if (SUCCEEDED(hr)) - { - hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); - if (SUCCEEDED(hr)) - { - hr = StrAllocString(&sczLicenseFilename, PathFile(sczLicenseFormatted), 0); - if (SUCCEEDED(hr)) - { - hr = LocProbeForFile(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath); - if (SUCCEEDED(hr)) - { - hr = ThemeLoadRichEditFromFile(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT, sczLicensePath, m_hModule); - } - } - } - } - } - } - } - } - - if (FAILED(hr)) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "Failed to load file into license richedit control from path '%ls' manifest value: %ls", sczLicensePath, m_sczLicenseFile); - hr = S_OK; - } - } - - if (m_pfnBAFunctionsProc) - { - themeLoadedArgs.cbSize = sizeof(themeLoadedArgs); - themeLoadedArgs.pTheme = m_pTheme; - themeLoadedArgs.pWixLoc = m_pWixLoc; - themeLoadedResults.cbSize = sizeof(themeLoadedResults); - hr = m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONTHEMELOADED, &themeLoadedArgs, &themeLoadedResults, m_pvBAFunctionsProcContext); - BalExitOnFailure(hr, "BAFunctions OnThemeLoaded failed."); - } - - LExit: - ReleaseStr(sczLicenseFilename); - ReleaseStr(sczLicenseDirectory); - ReleaseStr(sczLicensePath); - ReleaseStr(sczLicenseFormatted); - - return SUCCEEDED(hr); - } - - - // - // OnShowFailure - display the failure page. - // - void OnShowFailure() - { - SetState(WIXSTDBA_STATE_FAILED, S_OK); - - // If the UI should be visible, display it now and hide the splash screen - if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) - { - ::ShowWindow(m_pTheme->hwndParent, SW_SHOW); - } - - m_pEngine->CloseSplashScreen(); - - return; - } - - - // - // OnShowHelp - display the help page. - // - void OnShowHelp() - { - SetState(WIXSTDBA_STATE_HELP, S_OK); - - // If the UI should be visible, display it now and hide the splash screen - if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) - { - ::ShowWindow(m_pTheme->hwndParent, SW_SHOW); - } - - m_pEngine->CloseSplashScreen(); - - return; - } - - - // - // OnDetect - start the processing of packages. - // - void OnDetect() - { - HRESULT hr = S_OK; - - SetState(WIXSTDBA_STATE_DETECTING, hr); - - // If the UI should be visible, display it now and hide the splash screen - if (BOOTSTRAPPER_DISPLAY_NONE < m_command.display) - { - ::ShowWindow(m_pTheme->hwndParent, SW_SHOW); - } - - m_pEngine->CloseSplashScreen(); - - // Tell the core we're ready for the packages to be processed now. - hr = m_pEngine->Detect(); - BalExitOnFailure(hr, "Failed to start detecting chain."); - - LExit: - if (FAILED(hr)) - { - SetState(WIXSTDBA_STATE_DETECTING, hr); - } - - return; - } - - - // - // OnPlan - plan the detected changes. - // - void OnPlan( - __in BOOTSTRAPPER_ACTION action - ) - { - HRESULT hr = S_OK; - - m_plannedAction = action; - - // If we are going to apply a downgrade, bail. - if (m_fDowngrading && BOOTSTRAPPER_ACTION_UNINSTALL < action) - { - if (m_fSuppressDowngradeFailure) - { - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "A newer version of this product is installed but downgrade failure has been suppressed; continuing..."); - } - else - { - hr = HRESULT_FROM_WIN32(ERROR_PRODUCT_VERSION); - BalExitOnFailure(hr, "Cannot install a product when a newer version is installed."); - } - } - - SetState(WIXSTDBA_STATE_PLANNING, hr); - - hr = m_pEngine->Plan(action); - BalExitOnFailure(hr, "Failed to start planning packages."); - - LExit: - if (FAILED(hr)) - { - SetState(WIXSTDBA_STATE_PLANNING, hr); - } - - return; - } - - - // - // OnApply - apply the packages. - // - void OnApply() - { - HRESULT hr = S_OK; - - SetState(WIXSTDBA_STATE_APPLYING, hr); - SetProgressState(hr); - SetTaskbarButtonProgress(0); - - hr = m_pEngine->Apply(m_hWnd); - BalExitOnFailure(hr, "Failed to start applying packages."); - - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, TRUE); // ensure the cancel button is enabled before starting. - - LExit: - if (FAILED(hr)) - { - SetState(WIXSTDBA_STATE_APPLYING, hr); - } - - return; - } - - - // - // OnChangeState - change state. - // - void OnChangeState( - __in WIXSTDBA_STATE state - ) - { - WIXSTDBA_STATE stateOld = m_state; - DWORD dwOldPageId = 0; - DWORD dwNewPageId = 0; - LPWSTR sczText = NULL; - LPWSTR sczUnformattedText = NULL; - LPWSTR sczControlState = NULL; - LPWSTR sczControlName = NULL; - - m_state = state; - - // If our install is at the end (success or failure) and we're not showing full UI or - // we successfully installed the prerequisite then exit (prompt for restart if required). - if ((WIXSTDBA_STATE_APPLIED <= m_state && BOOTSTRAPPER_DISPLAY_FULL > m_command.display) || - (WIXSTDBA_STATE_APPLIED == m_state && m_fPrereq)) - { - // If a restart was required but we were not automatically allowed to - // accept the reboot then do the prompt. - if (m_fRestartRequired && !m_fAllowRestart) - { - StrAllocFromError(&sczUnformattedText, HRESULT_FROM_WIN32(ERROR_SUCCESS_REBOOT_REQUIRED), NULL); - - int nResult = ::MessageBoxW(m_hWnd, sczUnformattedText ? sczUnformattedText : L"The requested operation is successful. Changes will not be effective until the system is rebooted.", m_pTheme->sczCaption, MB_ICONEXCLAMATION | MB_OKCANCEL); - m_fAllowRestart = (IDOK == nResult); - } - - // Quietly exit. - ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); - } - else // try to change the pages. - { - DeterminePageId(stateOld, &dwOldPageId); - DeterminePageId(m_state, &dwNewPageId); - - if (dwOldPageId != dwNewPageId) - { - // Enable disable controls per-page. - if (m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL] == dwNewPageId) // on the "Install" page, ensure the install button is enabled/disabled correctly. - { - LONGLONG llElevated = 0; - if (m_Bundle.fPerMachine) - { - BalGetNumericVariable(WIXBUNDLE_VARIABLE_ELEVATED, &llElevated); - } - ThemeControlElevates(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON, (m_Bundle.fPerMachine && !llElevated)); - - // If the EULA control exists, show it only if a license URL is provided as well. - if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_EULA_LINK)) - { - BOOL fEulaLink = (m_sczLicenseUrl && *m_sczLicenseUrl); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_EULA_LINK, fEulaLink); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX, fEulaLink); - } - - BOOL fAcceptedLicense = !ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX) || !ThemeControlEnabled(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX) || ThemeIsControlChecked(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON, fAcceptedLicense); - } - else if (m_rgdwPageIds[WIXSTDBA_PAGE_MODIFY] == dwNewPageId) - { - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_REPAIR_BUTTON, !m_fSuppressRepair); - } - else if (m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS] == dwNewPageId) // on the "Success" page, check if the restart or launch button should be enabled. - { - BOOL fShowRestartButton = FALSE; - BOOL fLaunchTargetExists = FALSE; - if (m_fRestartRequired) - { - if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart) - { - fShowRestartButton = TRUE; - } - } - else if (ThemeControlExists(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON)) - { - fLaunchTargetExists = BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); - } - - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_LAUNCH_BUTTON, fLaunchTargetExists && BOOTSTRAPPER_ACTION_UNINSTALL < m_plannedAction); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_SUCCESS_RESTART_BUTTON, fShowRestartButton); - } - else if (m_rgdwPageIds[WIXSTDBA_PAGE_FAILURE] == dwNewPageId) // on the "Failure" page, show error message and check if the restart button should be enabled. - { - BOOL fShowLogLink = (m_Bundle.sczLogVariable && *m_Bundle.sczLogVariable); // if there is a log file variable then we'll assume the log file exists. - BOOL fShowErrorMessage = FALSE; - BOOL fShowRestartButton = FALSE; - - if (FAILED(m_hrFinal)) - { - // If we know the failure message, use that. - if (m_sczFailedMessage && *m_sczFailedMessage) - { - StrAllocString(&sczUnformattedText, m_sczFailedMessage, 0); - } - else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal) - { - HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.NET452WIN7RTMErrorMessage)", 0); - if (FAILED(hr)) - { - BalLogError(hr, "Failed to initialize NET452WIN7RTMErrorMessage loc identifier."); - } - else - { - hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText); - if (FAILED(hr)) - { - BalLogError(hr, "Failed to localize NET452WIN7RTMErrorMessage: %ls", sczUnformattedText); - ReleaseNullStr(sczUnformattedText); - } - } - } - else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal) - { - HRESULT hr = StrAllocString(&sczUnformattedText, L"#(loc.SCDRUNTIMEFAILUREErrorMessage)", 0); - if (FAILED(hr)) - { - BalLogError(hr, "Failed to initialize SCDRUNTIMEFAILUREErrorMessage loc identifier."); - } - else - { - hr = LocLocalizeString(m_pWixLoc, &sczUnformattedText); - if (FAILED(hr)) - { - BalLogError(hr, "Failed to localize SCDRUNTIMEFAILUREErrorMessage: %ls", sczUnformattedText); - ReleaseNullStr(sczUnformattedText); - } - } - } - else // try to get the error message from the error code. - { - StrAllocFromError(&sczUnformattedText, m_hrFinal, NULL); - if (!sczUnformattedText || !*sczUnformattedText) - { - StrAllocFromError(&sczUnformattedText, E_FAIL, NULL); - } - } - - if (E_WIXSTDBA_CONDITION_FAILED == m_hrFinal) - { - if (sczUnformattedText) - { - StrAllocString(&sczText, sczUnformattedText, 0); - } - } - else if (E_MBAHOST_NET452_ON_WIN7RTM == m_hrFinal) - { - if (sczUnformattedText) - { - BalFormatString(sczUnformattedText, &sczText); - } - } - else if (E_DNCHOST_SCD_RUNTIME_FAILURE == m_hrFinal) - { - if (sczUnformattedText) - { - BalFormatString(sczUnformattedText, &sczText); - } - } - else - { - StrAllocFormatted(&sczText, L"0x%08x - %ls", m_hrFinal, sczUnformattedText); - } - - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, sczText); - fShowErrorMessage = TRUE; - } - - if (m_fRestartRequired) - { - if (BOOTSTRAPPER_RESTART_PROMPT == m_command.restart) - { - fShowRestartButton = TRUE; - } - } - - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_LOGFILE_LINK, fShowLogLink); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_MESSAGE_TEXT, fShowErrorMessage); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_FAILURE_RESTART_BUTTON, fShowRestartButton); - } - - HRESULT hr = ThemeShowPage(m_pTheme, dwOldPageId, SW_HIDE); - if (FAILED(hr)) - { - BalLogError(hr, "Failed to hide page: %u", dwOldPageId); - } - - hr = ThemeShowPage(m_pTheme, dwNewPageId, SW_SHOW); - if (FAILED(hr)) - { - BalLogError(hr, "Failed to show page: %u", dwOldPageId); - } - - // On the install page set the focus to the install button or the next enabled control if install is disabled. - if (m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL] == dwNewPageId) - { - ThemeSetFocus(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON); - } - } - } - - ReleaseStr(sczText); - ReleaseStr(sczUnformattedText); - ReleaseStr(sczControlState); - ReleaseStr(sczControlName); - } - - - // - // OnClose - called when the window is trying to be closed. - // - BOOL OnClose() - { - BOOL fClose = FALSE; - BOOL fCancel = FALSE; - - // If we've already succeeded or failed or showing the help page, just close (prompts are annoying if the bootstrapper is done). - if (WIXSTDBA_STATE_APPLIED <= m_state || WIXSTDBA_STATE_HELP == m_state) - { - fClose = TRUE; - } - else // prompt the user or force the cancel if there is no UI. - { - ::EnterCriticalSection(&m_csShowingInternalUiThisPackage); - fClose = PromptCancel( - m_hWnd, - BOOTSTRAPPER_DISPLAY_FULL != m_command.display || m_fShowingInternalUiThisPackage, - m_sczConfirmCloseMessage ? m_sczConfirmCloseMessage : L"Are you sure you want to cancel?", - m_pTheme->sczCaption); - ::LeaveCriticalSection(&m_csShowingInternalUiThisPackage); - - fCancel = fClose; - } - - // If we're doing progress then we never close, we just cancel to let rollback occur. - if (WIXSTDBA_STATE_APPLYING <= m_state && WIXSTDBA_STATE_APPLIED > m_state) - { - // If we canceled, disable cancel button since clicking it again is silly. - if (fClose) - { - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_PROGRESS_CANCEL_BUTTON, FALSE); - } - - fClose = FALSE; - } - - if (fClose) - { - DWORD dwCurrentPageId = 0; - DeterminePageId(m_state, &dwCurrentPageId); - - // Hide the current page to let thmutil do its thing with variables. - ThemeShowPageEx(m_pTheme, dwCurrentPageId, SW_HIDE, fCancel ? THEME_SHOW_PAGE_REASON_CANCEL : THEME_SHOW_PAGE_REASON_DEFAULT); - } - - return fClose; - } - - - // - // OnClickAcceptCheckbox - allow the install to continue. - // - void OnClickAcceptCheckbox() - { - BOOL fAcceptedLicense = ThemeIsControlChecked(m_pTheme, WIXSTDBA_CONTROL_EULA_ACCEPT_CHECKBOX); - ThemeControlEnable(m_pTheme, WIXSTDBA_CONTROL_INSTALL_BUTTON, fAcceptedLicense); - } - - - // - // OnClickInstallButton - start the install by planning the packages. - // - void OnClickInstallButton() - { - this->OnPlan(BOOTSTRAPPER_ACTION_INSTALL); - } - - - // - // OnClickRepairButton - start the repair. - // - void OnClickRepairButton() - { - this->OnPlan(BOOTSTRAPPER_ACTION_REPAIR); - } - - - // - // OnClickUninstallButton - start the uninstall. - // - void OnClickUninstallButton() - { - this->OnPlan(BOOTSTRAPPER_ACTION_UNINSTALL); - } - - - // - // OnClickCloseButton - close the application. - // - void OnClickCloseButton() - { - ::SendMessageW(m_hWnd, WM_CLOSE, 0, 0); - } - - - // - // OnClickEulaLink - show the end user license agreement. - // - void OnClickEulaLink() - { - HRESULT hr = S_OK; - LPWSTR sczLicenseUrl = NULL; - LPWSTR sczLicensePath = NULL; - LPWSTR sczLicenseDirectory = NULL; - LPWSTR sczLicenseFilename = NULL; - URI_PROTOCOL protocol = URI_PROTOCOL_UNKNOWN; - - hr = StrAllocString(&sczLicenseUrl, m_sczLicenseUrl, 0); - BalExitOnFailure(hr, "Failed to copy license URL: %ls", m_sczLicenseUrl); - - hr = LocLocalizeString(m_pWixLoc, &sczLicenseUrl); - BalExitOnFailure(hr, "Failed to localize license URL: %ls", m_sczLicenseUrl); - - // Assume there is no hidden variables to be formatted - // so don't worry about securely freeing it. - hr = BalFormatString(sczLicenseUrl, &sczLicenseUrl); - BalExitOnFailure(hr, "Failed to get formatted license URL: %ls", m_sczLicenseUrl); - - hr = UriProtocol(sczLicenseUrl, &protocol); - if (FAILED(hr) || URI_PROTOCOL_UNKNOWN == protocol) - { - // Probe for localized license file - hr = PathRelativeToModule(&sczLicensePath, sczLicenseUrl, m_hModule); - if (SUCCEEDED(hr)) - { - hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory); - if (SUCCEEDED(hr)) - { - hr = LocProbeForFile(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath); - } - } - } - - hr = ShelExecUnelevated(sczLicensePath ? sczLicensePath : sczLicenseUrl, NULL, L"open", NULL, SW_SHOWDEFAULT); - BalExitOnFailure(hr, "Failed to launch URL to EULA."); - - LExit: - ReleaseStr(sczLicensePath); - ReleaseStr(sczLicenseUrl); - ReleaseStr(sczLicenseDirectory); - ReleaseStr(sczLicenseFilename); - - return; - } - - - // - // OnClickLaunchButton - launch the app from the success page. - // - void OnClickLaunchButton() - { - HRESULT hr = S_OK; - LPWSTR sczUnformattedLaunchTarget = NULL; - LPWSTR sczLaunchTarget = NULL; - LPWSTR sczLaunchTargetElevatedId = NULL; - LPWSTR sczUnformattedArguments = NULL; - LPWSTR sczArguments = NULL; - LPWSTR sczUnformattedLaunchFolder = NULL; - LPWSTR sczLaunchFolder = NULL; - int nCmdShow = SW_SHOWNORMAL; - - hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH, &sczUnformattedLaunchTarget); - BalExitOnFailure(hr, "Failed to get launch target variable '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_TARGET_PATH); - - hr = BalFormatString(sczUnformattedLaunchTarget, &sczLaunchTarget); - BalExitOnFailure(hr, "Failed to format launch target variable: %ls", sczUnformattedLaunchTarget); - - if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID)) - { - hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID, &sczLaunchTargetElevatedId); - BalExitOnFailure(hr, "Failed to get launch target elevated id '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_TARGET_ELEVATED_ID); - } - - if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS)) - { - hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS, &sczUnformattedArguments); - BalExitOnFailure(hr, "Failed to get launch arguments '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_ARGUMENTS); - } - - if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_HIDDEN)) - { - nCmdShow = SW_HIDE; - } - - if (BalVariableExists(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER)) - { - hr = BalGetStringVariable(WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER, &sczUnformattedLaunchFolder); - BalExitOnFailure(hr, "Failed to get launch working directory variable '%ls'.", WIXSTDBA_VARIABLE_LAUNCH_WORK_FOLDER); - } - - if (sczLaunchTargetElevatedId && !m_fTriedToLaunchElevated) - { - m_fTriedToLaunchElevated = TRUE; - hr = m_pEngine->LaunchApprovedExe(m_hWnd, sczLaunchTargetElevatedId, sczUnformattedArguments, 0); - if (FAILED(hr)) - { - BalLogError(hr, "Failed to launch elevated target: %ls", sczLaunchTargetElevatedId); - - //try with ShelExec next time - OnClickLaunchButton(); - } - } - else - { - if (sczUnformattedArguments) - { - hr = BalFormatString(sczUnformattedArguments, &sczArguments); - BalExitOnFailure(hr, "Failed to format launch arguments variable: %ls", sczUnformattedArguments); - } - - if (sczUnformattedLaunchFolder) - { - hr = BalFormatString(sczUnformattedLaunchFolder, &sczLaunchFolder); - BalExitOnFailure(hr, "Failed to format launch working directory variable: %ls", sczUnformattedLaunchFolder); - } - - hr = ShelExec(sczLaunchTarget, sczArguments, L"open", sczLaunchFolder, nCmdShow, m_hWnd, NULL); - BalExitOnFailure(hr, "Failed to launch target: %ls", sczLaunchTarget); - - ::PostMessageW(m_hWnd, WM_CLOSE, 0, 0); - } - - LExit: - StrSecureZeroFreeString(sczLaunchFolder); - ReleaseStr(sczUnformattedLaunchFolder); - StrSecureZeroFreeString(sczArguments); - ReleaseStr(sczUnformattedArguments); - ReleaseStr(sczLaunchTargetElevatedId); - StrSecureZeroFreeString(sczLaunchTarget); - ReleaseStr(sczUnformattedLaunchTarget); - - return; - } - - - // - // OnClickRestartButton - allows the restart and closes the app. - // - void OnClickRestartButton() - { - AssertSz(m_fRestartRequired, "Restart must be requested to be able to click on the restart button."); - - m_fAllowRestart = TRUE; - ::SendMessageW(m_hWnd, WM_CLOSE, 0, 0); - - return; - } - - - // - // OnClickLogFileLink - show the log file. - // - void OnClickLogFileLink() - { - HRESULT hr = S_OK; - LPWSTR sczLogFile = NULL; - - hr = BalGetStringVariable(m_Bundle.sczLogVariable, &sczLogFile); - BalExitOnFailure(hr, "Failed to get log file variable '%ls'.", m_Bundle.sczLogVariable); - - hr = ShelExecUnelevated(L"notepad.exe", sczLogFile, L"open", NULL, SW_SHOWDEFAULT); - BalExitOnFailure(hr, "Failed to open log file target: %ls", sczLogFile); - - LExit: - ReleaseStr(sczLogFile); - - return; - } - - - // - // SetState - // - void SetState( - __in WIXSTDBA_STATE state, - __in HRESULT hrStatus - ) - { - if (FAILED(hrStatus)) - { - m_hrFinal = hrStatus; - } - - if (FAILED(m_hrFinal)) - { - state = WIXSTDBA_STATE_FAILED; - } - - if (m_state < state) - { - ::PostMessageW(m_hWnd, WM_WIXSTDBA_CHANGE_STATE, 0, state); - } - } - - - void DeterminePageId( - __in WIXSTDBA_STATE state, - __out DWORD* pdwPageId - ) - { - if (BOOTSTRAPPER_DISPLAY_PASSIVE == m_command.display) - { - switch (state) - { - case WIXSTDBA_STATE_INITIALIZED: - *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_command.action ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING]; - break; - - case WIXSTDBA_STATE_HELP: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_HELP]; - break; - - case WIXSTDBA_STATE_DETECTING: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_LOADING] ? m_rgdwPageIds[WIXSTDBA_PAGE_LOADING] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] ? m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS]; - break; - - case WIXSTDBA_STATE_DETECTED: __fallthrough; - case WIXSTDBA_STATE_PLANNING: __fallthrough; - case WIXSTDBA_STATE_PLANNED: __fallthrough; - case WIXSTDBA_STATE_APPLYING: __fallthrough; - case WIXSTDBA_STATE_CACHING: __fallthrough; - case WIXSTDBA_STATE_CACHED: __fallthrough; - case WIXSTDBA_STATE_EXECUTING: __fallthrough; - case WIXSTDBA_STATE_EXECUTED: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] ? m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS_PASSIVE] : m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS]; - break; - - default: - *pdwPageId = 0; - break; - } - } - else if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display) - { - switch (state) - { - case WIXSTDBA_STATE_INITIALIZING: - *pdwPageId = 0; - break; - - case WIXSTDBA_STATE_INITIALIZED: - *pdwPageId = BOOTSTRAPPER_ACTION_HELP == m_command.action ? m_rgdwPageIds[WIXSTDBA_PAGE_HELP] : m_rgdwPageIds[WIXSTDBA_PAGE_LOADING]; - break; - - case WIXSTDBA_STATE_HELP: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_HELP]; - break; - - case WIXSTDBA_STATE_DETECTING: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_LOADING]; - break; - - case WIXSTDBA_STATE_DETECTED: - switch (m_command.action) - { - case BOOTSTRAPPER_ACTION_INSTALL: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_INSTALL]; - break; - - case BOOTSTRAPPER_ACTION_MODIFY: __fallthrough; - case BOOTSTRAPPER_ACTION_REPAIR: __fallthrough; - case BOOTSTRAPPER_ACTION_UNINSTALL: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_MODIFY]; - break; - } - break; - - case WIXSTDBA_STATE_PLANNING: __fallthrough; - case WIXSTDBA_STATE_PLANNED: __fallthrough; - case WIXSTDBA_STATE_APPLYING: __fallthrough; - case WIXSTDBA_STATE_CACHING: __fallthrough; - case WIXSTDBA_STATE_CACHED: __fallthrough; - case WIXSTDBA_STATE_EXECUTING: __fallthrough; - case WIXSTDBA_STATE_EXECUTED: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_PROGRESS]; - break; - - case WIXSTDBA_STATE_APPLIED: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_SUCCESS]; - break; - - case WIXSTDBA_STATE_FAILED: - *pdwPageId = m_rgdwPageIds[WIXSTDBA_PAGE_FAILURE]; - break; - } - } - } - - - HRESULT EvaluateConditions() - { - HRESULT hr = S_OK; - BOOL fResult = FALSE; - - for (DWORD i = 0; i < m_Conditions.cConditions; ++i) - { - BAL_CONDITION* pCondition = m_Conditions.rgConditions + i; - - hr = BalConditionEvaluate(pCondition, m_pEngine, &fResult, &m_sczFailedMessage); - BalExitOnFailure(hr, "Failed to evaluate condition."); - - if (!fResult) - { - hr = E_WIXSTDBA_CONDITION_FAILED; - BalExitOnFailure(hr, "%ls", m_sczFailedMessage); - } - } - - ReleaseNullStrSecure(m_sczFailedMessage); - - LExit: - return hr; - } - - void UpdateCacheProgress( - __in DWORD dwOverallPercentage - ) - { - WCHAR wzProgress[5] = { }; - - ::StringCchPrintfW(wzProgress, countof(wzProgress), L"%u%%", dwOverallPercentage); - ThemeSetTextControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_TEXT, wzProgress); - - ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_CACHE_PROGRESS_BAR, dwOverallPercentage); - - m_dwCalculatedCacheProgress = dwOverallPercentage * WIXSTDBA_ACQUIRE_PERCENTAGE / 100; - ThemeSetProgressControl(m_pTheme, WIXSTDBA_CONTROL_OVERALL_CALCULATED_PROGRESS_BAR, m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); - - SetTaskbarButtonProgress(m_dwCalculatedCacheProgress + m_dwCalculatedExecuteProgress); - } - - - void SetTaskbarButtonProgress( - __in DWORD dwOverallPercentage - ) - { - HRESULT hr = S_OK; - - if (m_fTaskbarButtonOK) - { - hr = m_pTaskbarList->SetProgressValue(m_hWnd, dwOverallPercentage, 100UL); - BalExitOnFailure(hr, "Failed to set taskbar button progress to: %d%%.", dwOverallPercentage); - } - - LExit: - return; - } - - - void SetTaskbarButtonState( - __in TBPFLAG tbpFlags - ) - { - HRESULT hr = S_OK; - - if (m_fTaskbarButtonOK) - { - hr = m_pTaskbarList->SetProgressState(m_hWnd, tbpFlags); - BalExitOnFailure(hr, "Failed to set taskbar button state.", tbpFlags); - } - - LExit: - return; - } - - - void SetProgressState( - __in HRESULT hrStatus - ) - { - TBPFLAG flag = TBPF_NORMAL; - - if (IsCanceled() || HRESULT_FROM_WIN32(ERROR_INSTALL_USEREXIT) == hrStatus) - { - flag = TBPF_PAUSED; - } - else if (IsRollingBack() || FAILED(hrStatus)) - { - flag = TBPF_ERROR; - } - - SetTaskbarButtonState(flag); - } - - - HRESULT LoadBAFunctions( - __in IXMLDOMDocument* pixdManifest - ) - { - HRESULT hr = S_OK; - IXMLDOMNode* pBAFunctionsNode = NULL; - IXMLDOMNode* pPayloadNode = NULL; - LPWSTR sczPayloadId = NULL; - LPWSTR sczPayloadXPath = NULL; - LPWSTR sczBafName = NULL; - LPWSTR sczBafPath = NULL; - BA_FUNCTIONS_CREATE_ARGS bafCreateArgs = { }; - BA_FUNCTIONS_CREATE_RESULTS bafCreateResults = { }; - - hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBalBAFunctions", &pBAFunctionsNode); - BalExitOnFailure(hr, "Failed to read WixBalBAFunctions node from BootstrapperApplicationData.xml."); - - if (S_FALSE == hr) - { - ExitFunction(); - } - - hr = XmlGetAttributeEx(pBAFunctionsNode, L"PayloadId", &sczPayloadId); - BalExitOnFailure(hr, "Failed to get BAFunctions PayloadId."); - - hr = StrAllocFormatted(&sczPayloadXPath, L"/BootstrapperApplicationData/WixPayloadProperties[@Payload='%ls']", sczPayloadId); - BalExitOnFailure(hr, "Failed to format BAFunctions payload XPath."); - - hr = XmlSelectSingleNode(pixdManifest, sczPayloadXPath, &pPayloadNode); - if (S_FALSE == hr) - { - hr = E_NOTFOUND; - } - BalExitOnFailure(hr, "Failed to find WixPayloadProperties node for BAFunctions PayloadId: %ls.", sczPayloadId); - - hr = XmlGetAttributeEx(pPayloadNode, L"Name", &sczBafName); - BalExitOnFailure(hr, "Failed to get BAFunctions Name."); - - hr = PathRelativeToModule(&sczBafPath, sczBafName, m_hModule); - BalExitOnFailure(hr, "Failed to get path to BAFunctions DLL."); - - BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: LoadBAFunctions() - BAFunctions DLL %ls", sczBafPath); - - m_hBAFModule = ::LoadLibraryExW(sczBafPath, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); - BalExitOnNullWithLastError(m_hBAFModule, hr, "WIXSTDBA: LoadBAFunctions() - Failed to load DLL %ls", sczBafPath); - - PFN_BA_FUNCTIONS_CREATE pfnBAFunctionsCreate = reinterpret_cast(::GetProcAddress(m_hBAFModule, "BAFunctionsCreate")); - BalExitOnNullWithLastError(pfnBAFunctionsCreate, hr, "Failed to get BAFunctionsCreate entry-point from: %ls", sczBafPath); - - bafCreateArgs.cbSize = sizeof(bafCreateArgs); - bafCreateArgs.qwBAFunctionsAPIVersion = MAKEQWORDVERSION(0, 0, 0, 2); // TODO: need to decide whether to keep this, and if so when to update it. - bafCreateArgs.pBootstrapperCreateArgs = &m_createArgs; - - bafCreateResults.cbSize = sizeof(bafCreateResults); - - hr = pfnBAFunctionsCreate(&bafCreateArgs, &bafCreateResults); - BalExitOnFailure(hr, "Failed to create BAFunctions."); - - m_pfnBAFunctionsProc = bafCreateResults.pfnBAFunctionsProc; - m_pvBAFunctionsProcContext = bafCreateResults.pvBAFunctionsProcContext; - - LExit: - if (m_hBAFModule && !m_pfnBAFunctionsProc) - { - ::FreeLibrary(m_hBAFModule); - m_hBAFModule = NULL; - } - ReleaseStr(sczBafPath); - ReleaseStr(sczBafName); - ReleaseStr(sczPayloadXPath); - ReleaseStr(sczPayloadId); - ReleaseObject(pBAFunctionsNode); - ReleaseObject(pPayloadNode); - - return hr; - } - - -public: - // - // Constructor - initialize member variables. - // - CWixStandardBootstrapperApplication( - __in HMODULE hModule, - __in BOOL fPrereq, - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs - ) : CBalBaseBootstrapperApplication(pEngine, pArgs, 3, 3000) - { - m_hModule = hModule; - memcpy_s(&m_command, sizeof(m_command), pArgs->pCommand, sizeof(BOOTSTRAPPER_COMMAND)); - memcpy_s(&m_createArgs, sizeof(m_createArgs), pArgs, sizeof(BOOTSTRAPPER_CREATE_ARGS)); - m_createArgs.pCommand = &m_command; - - if (fPrereq) - { - // Pre-req BA should only show help or do an install (to launch the Managed BA which can then do the right action). - if (BOOTSTRAPPER_ACTION_HELP != m_command.action) - { - m_command.action = BOOTSTRAPPER_ACTION_INSTALL; - } - } - else // maybe modify the action state if the bundle is or is not already installed. - { - LONGLONG llInstalled = 0; - HRESULT hr = BalGetNumericVariable(L"WixBundleInstalled", &llInstalled); - if (SUCCEEDED(hr) && BOOTSTRAPPER_RESUME_TYPE_REBOOT != m_command.resumeType && 0 < llInstalled && BOOTSTRAPPER_ACTION_INSTALL == m_command.action) - { - m_command.action = BOOTSTRAPPER_ACTION_MODIFY; - } - else if (0 == llInstalled && (BOOTSTRAPPER_ACTION_MODIFY == m_command.action || BOOTSTRAPPER_ACTION_REPAIR == m_command.action)) - { - m_command.action = BOOTSTRAPPER_ACTION_INSTALL; - } - } - - m_plannedAction = BOOTSTRAPPER_ACTION_UNKNOWN; - - // When resuming from restart doing some install-like operation, try to find the package that forced the - // restart. We'll use this information during planning. - m_sczAfterForcedRestartPackage = NULL; - - if (BOOTSTRAPPER_RESUME_TYPE_REBOOT == m_command.resumeType && BOOTSTRAPPER_ACTION_UNINSTALL < m_command.action) - { - // Ensure the forced restart package variable is null when it is an empty string. - HRESULT hr = BalGetStringVariable(L"WixBundleForcedRestartPackage", &m_sczAfterForcedRestartPackage); - if (FAILED(hr) || !m_sczAfterForcedRestartPackage || !*m_sczAfterForcedRestartPackage) - { - ReleaseNullStr(m_sczAfterForcedRestartPackage); - } - } - - m_pWixLoc = NULL; - memset(&m_Bundle, 0, sizeof(m_Bundle)); - memset(&m_Conditions, 0, sizeof(m_Conditions)); - m_sczConfirmCloseMessage = NULL; - m_sczFailedMessage = NULL; - - m_sczLanguage = NULL; - m_pTheme = NULL; - memset(m_rgdwPageIds, 0, sizeof(m_rgdwPageIds)); - m_hUiThread = NULL; - m_fRegistered = FALSE; - m_hWnd = NULL; - - m_state = WIXSTDBA_STATE_INITIALIZING; - m_hrFinal = hrHostInitialization; - - m_fDowngrading = FALSE; - m_restartResult = BOOTSTRAPPER_APPLY_RESTART_NONE; - m_fRestartRequired = FALSE; - m_fAllowRestart = FALSE; - - m_sczLicenseFile = NULL; - m_sczLicenseUrl = NULL; - m_fSuppressDowngradeFailure = FALSE; - m_fSuppressRepair = FALSE; - m_fSupportCacheOnly = FALSE; - - m_sdOverridableVariables = NULL; - m_pTaskbarList = NULL; - m_uTaskbarButtonCreatedMessage = UINT_MAX; - m_fTaskbarButtonOK = FALSE; - ::InitializeCriticalSection(&m_csShowingInternalUiThisPackage); - m_fShowingInternalUiThisPackage = FALSE; - m_fTriedToLaunchElevated = FALSE; - - m_fPrereq = fPrereq; - m_fPrereqInstalled = FALSE; - m_fPrereqAlreadyInstalled = FALSE; - - pEngine->AddRef(); - m_pEngine = pEngine; - - m_hBAFModule = NULL; - m_pfnBAFunctionsProc = NULL; - m_pvBAFunctionsProcContext = NULL; - } - - - // - // Destructor - release member variables. - // - ~CWixStandardBootstrapperApplication() - { - AssertSz(!::IsWindow(m_hWnd), "Window should have been destroyed before destructor."); - AssertSz(!m_pTaskbarList, "Taskbar should have been released before destructor."); - AssertSz(!m_pTheme, "Theme should have been released before destructor."); - - for (DWORD i = 0; i < m_Bundle.packages.cPackages; ++i) - { - ReleaseMem(m_Bundle.packages.rgPackages[i].pvCustomData); - } - - ::DeleteCriticalSection(&m_csShowingInternalUiThisPackage); - ReleaseDict(m_sdOverridableVariables); - ReleaseStr(m_sczFailedMessage); - ReleaseStr(m_sczConfirmCloseMessage); - BalConditionsUninitialize(&m_Conditions); - BalInfoUninitialize(&m_Bundle); - LocFree(m_pWixLoc); - - ReleaseStr(m_sczLanguage); - ReleaseStr(m_sczLicenseFile); - ReleaseStr(m_sczLicenseUrl); - ReleaseStr(m_sczAfterForcedRestartPackage); - ReleaseNullObject(m_pEngine); - - if (m_hBAFModule) - { - PFN_BA_FUNCTIONS_DESTROY pfnBAFunctionsDestroy = reinterpret_cast(::GetProcAddress(m_hBAFModule, "BAFunctionsDestroy")); - if (pfnBAFunctionsDestroy) - { - pfnBAFunctionsDestroy(); - } - - ::FreeLibrary(m_hBAFModule); - m_hBAFModule = NULL; - } - } - -private: - HMODULE m_hModule; - BOOTSTRAPPER_CREATE_ARGS m_createArgs; - BOOTSTRAPPER_COMMAND m_command; - IBootstrapperEngine* m_pEngine; - BOOTSTRAPPER_ACTION m_plannedAction; - - LPWSTR m_sczAfterForcedRestartPackage; - - WIX_LOCALIZATION* m_pWixLoc; - BAL_INFO_BUNDLE m_Bundle; - BAL_CONDITIONS m_Conditions; - LPWSTR m_sczFailedMessage; - LPWSTR m_sczConfirmCloseMessage; - - LPWSTR m_sczLanguage; - THEME* m_pTheme; - DWORD m_rgdwPageIds[countof(vrgwzPageNames)]; - HANDLE m_hUiThread; - BOOL m_fRegistered; - HWND m_hWnd; - - WIXSTDBA_STATE m_state; - HRESULT m_hrFinal; - - BOOL m_fStartedExecution; - DWORD m_dwCalculatedCacheProgress; - DWORD m_dwCalculatedExecuteProgress; - - BOOL m_fDowngrading; - BOOTSTRAPPER_APPLY_RESTART m_restartResult; - BOOL m_fRestartRequired; - BOOL m_fAllowRestart; - - LPWSTR m_sczLicenseFile; - LPWSTR m_sczLicenseUrl; - BOOL m_fSuppressDowngradeFailure; - BOOL m_fSuppressRepair; - BOOL m_fSupportCacheOnly; - - STRINGDICT_HANDLE m_sdOverridableVariables; - - BOOL m_fPrereq; - BOOL m_fPrereqInstalled; - BOOL m_fPrereqAlreadyInstalled; - - ITaskbarList3* m_pTaskbarList; - UINT m_uTaskbarButtonCreatedMessage; - BOOL m_fTaskbarButtonOK; - CRITICAL_SECTION m_csShowingInternalUiThisPackage; - BOOL m_fShowingInternalUiThisPackage; - BOOL m_fTriedToLaunchElevated; - - HMODULE m_hBAFModule; - PFN_BA_FUNCTIONS_PROC m_pfnBAFunctionsProc; - LPVOID m_pvBAFunctionsProcContext; -}; - - -// -// CreateBootstrapperApplication - creates a new IBootstrapperApplication object. -// -HRESULT CreateBootstrapperApplication( - __in HMODULE hModule, - __in BOOL fPrereq, - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults, - __out IBootstrapperApplication** ppApplication - ) -{ - HRESULT hr = S_OK; - CWixStandardBootstrapperApplication* pApplication = NULL; - - if (BOOTSTRAPPER_DISPLAY_UNKNOWN == pArgs->pCommand->display) - { - BalExitOnFailure(hr = E_INVALIDARG, "Engine requested Unknown display type."); - } - - pApplication = new CWixStandardBootstrapperApplication(hModule, fPrereq, hrHostInitialization, pEngine, pArgs); - ExitOnNull(pApplication, hr, E_OUTOFMEMORY, "Failed to create new standard bootstrapper application object."); - - pResults->pfnBootstrapperApplicationProc = BalBaseBootstrapperApplicationProc; - pResults->pvBootstrapperApplicationProcContext = pApplication; - *ppApplication = pApplication; - pApplication = NULL; - -LExit: - ReleaseObject(pApplication); - return hr; -} - - -static HRESULT DAPI EvaluateVariableConditionCallback( - __in_z LPCWSTR wzCondition, - __out BOOL* pf, - __in_opt LPVOID /*pvContext*/ - ) -{ - return BalEvaluateCondition(wzCondition, pf); -} - - -static HRESULT DAPI FormatVariableStringCallback( - __in_z LPCWSTR wzFormat, - __inout LPWSTR* psczOut, - __in_opt LPVOID /*pvContext*/ - ) -{ - return BalFormatString(wzFormat, psczOut); -} - - -static HRESULT DAPI GetVariableNumericCallback( - __in_z LPCWSTR wzVariable, - __out LONGLONG* pllValue, - __in_opt LPVOID /*pvContext*/ - ) -{ - return BalGetNumericVariable(wzVariable, pllValue); -} - - -static HRESULT DAPI SetVariableNumericCallback( - __in_z LPCWSTR wzVariable, - __in LONGLONG llValue, - __in_opt LPVOID /*pvContext*/ - ) -{ - return BalSetNumericVariable(wzVariable, llValue); -} - - -static HRESULT DAPI GetVariableStringCallback( - __in_z LPCWSTR wzVariable, - __inout LPWSTR* psczValue, - __in_opt LPVOID /*pvContext*/ - ) -{ - return BalGetStringVariable(wzVariable, psczValue); -} - - -static HRESULT DAPI SetVariableStringCallback( - __in_z LPCWSTR wzVariable, - __in_z_opt LPCWSTR wzValue, - __in BOOL fFormatted, - __in_opt LPVOID /*pvContext*/ - ) -{ - return BalSetStringVariable(wzVariable, wzValue, fFormatted); -} - -static LPCSTR LoggingRequestStateToString( - __in BOOTSTRAPPER_REQUEST_STATE requestState - ) -{ - switch (requestState) - { - case BOOTSTRAPPER_REQUEST_STATE_NONE: - return "None"; - case BOOTSTRAPPER_REQUEST_STATE_FORCE_ABSENT: - return "ForceAbsent"; - case BOOTSTRAPPER_REQUEST_STATE_ABSENT: - return "Absent"; - case BOOTSTRAPPER_REQUEST_STATE_CACHE: - return "Cache"; - case BOOTSTRAPPER_REQUEST_STATE_PRESENT: - return "Present"; - case BOOTSTRAPPER_REQUEST_STATE_REPAIR: - return "Repair"; - default: - return "Invalid"; - } -} - -static LPCSTR LoggingMsiFeatureStateToString( - __in BOOTSTRAPPER_FEATURE_STATE featureState - ) -{ - switch (featureState) - { - case BOOTSTRAPPER_FEATURE_STATE_UNKNOWN: - return "Unknown"; - case BOOTSTRAPPER_FEATURE_STATE_ABSENT: - return "Absent"; - case BOOTSTRAPPER_FEATURE_STATE_ADVERTISED: - return "Advertised"; - case BOOTSTRAPPER_FEATURE_STATE_LOCAL: - return "Local"; - case BOOTSTRAPPER_FEATURE_STATE_SOURCE: - return "Source"; - default: - return "Invalid"; - } -} diff --git a/src/wixstdba/packages.config b/src/wixstdba/packages.config deleted file mode 100644 index 071284ac..00000000 --- a/src/wixstdba/packages.config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/wixstdba/precomp.cpp b/src/wixstdba/precomp.cpp deleted file mode 100644 index 37664a1c..00000000 --- a/src/wixstdba/precomp.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// 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. - -#include "precomp.h" diff --git a/src/wixstdba/precomp.h b/src/wixstdba/precomp.h deleted file mode 100644 index 547183bd..00000000 --- a/src/wixstdba/precomp.h +++ /dev/null @@ -1,58 +0,0 @@ -#pragma once -// 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. - - -#include - -#pragma warning(push) -#pragma warning(disable:4458) // declaration of 'xxx' hides class member -#include -#pragma warning(pop) - -#include -#include -#include -#include -#include -#include -#include - -#include "dutil.h" -#include "apputil.h" -#include "memutil.h" -#include "dictutil.h" -#include "dirutil.h" -#include "fileutil.h" -#include "locutil.h" -#include "logutil.h" -#include "pathutil.h" -#include "resrutil.h" -#include "shelutil.h" -#include "strutil.h" -#include "thmutil.h" -#include "verutil.h" -#include "uriutil.h" -#include "xmlutil.h" - -#include "BootstrapperEngine.h" -#include "BootstrapperApplication.h" -#include "IBootstrapperEngine.h" -#include "IBootstrapperApplication.h" - -#include "balutil.h" -#include "balinfo.h" -#include "balcondition.h" - -#include "BAFunctions.h" - -#include "wixstdba.messages.h" - -HRESULT CreateBootstrapperApplication( - __in HMODULE hModule, - __in BOOL fPrereq, - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults, - __out IBootstrapperApplication** ppApplication - ); diff --git a/src/wixstdba/resource.h b/src/wixstdba/resource.h deleted file mode 100644 index 149a8ff4..00000000 --- a/src/wixstdba/resource.h +++ /dev/null @@ -1,15 +0,0 @@ -// 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. - -#define IDC_STATIC -1 - - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 102 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1003 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/src/wixstdba/wixstdba.cpp b/src/wixstdba/wixstdba.cpp deleted file mode 100644 index a96f1738..00000000 --- a/src/wixstdba/wixstdba.cpp +++ /dev/null @@ -1,144 +0,0 @@ -// 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. - -#include "precomp.h" - -static HINSTANCE vhInstance = NULL; -static IBootstrapperApplication* vpApplication = NULL; - -static void CALLBACK WixstdbaTraceError( - __in_z LPCSTR szFile, - __in int iLine, - __in REPORT_LEVEL rl, - __in UINT source, - __in HRESULT hrError, - __in_z __format_string LPCSTR szFormat, - __in va_list args - ); - -extern "C" BOOL WINAPI DllMain( - IN HINSTANCE hInstance, - IN DWORD dwReason, - IN LPVOID /* pvReserved */ - ) -{ - switch(dwReason) - { - case DLL_PROCESS_ATTACH: - ::DisableThreadLibraryCalls(hInstance); - vhInstance = hInstance; - break; - - case DLL_PROCESS_DETACH: - vhInstance = NULL; - break; - } - - return TRUE; -} - - -extern "C" HRESULT WINAPI BootstrapperApplicationCreate( - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - IBootstrapperEngine* pEngine = NULL; - - DutilInitialize(&WixstdbaTraceError); - - hr = BalInitializeFromCreateArgs(pArgs, &pEngine); - ExitOnFailure(hr, "Failed to initialize Bal."); - - hr = CreateBootstrapperApplication(vhInstance, FALSE, S_OK, pEngine, pArgs, pResults, &vpApplication); - BalExitOnFailure(hr, "Failed to create bootstrapper application interface."); - -LExit: - ReleaseObject(pEngine); - - return hr; -} - - -extern "C" void WINAPI BootstrapperApplicationDestroy() -{ - ReleaseNullObject(vpApplication); - BalUninitialize(); - DutilUninitialize(); -} - - -extern "C" HRESULT WINAPI DncPrereqBootstrapperApplicationCreate( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - - DutilInitialize(&WixstdbaTraceError); - - BalInitialize(pEngine); - - hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication); - BalExitOnFailure(hr, "Failed to create .NET Core prerequisite bootstrapper application interface."); - -LExit: - return hr; -} - - -extern "C" void WINAPI DncPrereqBootstrapperApplicationDestroy() -{ - ReleaseNullObject(vpApplication); - BalUninitialize(); - DutilUninitialize(); -} - - -extern "C" HRESULT WINAPI MbaPrereqBootstrapperApplicationCreate( - __in HRESULT hrHostInitialization, - __in IBootstrapperEngine* pEngine, - __in const BOOTSTRAPPER_CREATE_ARGS* pArgs, - __inout BOOTSTRAPPER_CREATE_RESULTS* pResults - ) -{ - HRESULT hr = S_OK; - - DutilInitialize(&WixstdbaTraceError); - - BalInitialize(pEngine); - - hr = CreateBootstrapperApplication(vhInstance, TRUE, hrHostInitialization, pEngine, pArgs, pResults, &vpApplication); - BalExitOnFailure(hr, "Failed to create managed prerequisite bootstrapper application interface."); - -LExit: - return hr; -} - - -extern "C" void WINAPI MbaPrereqBootstrapperApplicationDestroy() -{ - ReleaseNullObject(vpApplication); - BalUninitialize(); - DutilUninitialize(); -} - -static void CALLBACK WixstdbaTraceError( - __in_z LPCSTR /*szFile*/, - __in int /*iLine*/, - __in REPORT_LEVEL /*rl*/, - __in UINT source, - __in HRESULT hrError, - __in_z __format_string LPCSTR szFormat, - __in va_list args - ) -{ - // BalLogError currently uses the Exit... macros, - // so if expanding the scope need to ensure this doesn't get called recursively. - if (DUTIL_SOURCE_THMUTIL == source) - { - BalLogErrorArgs(hrError, szFormat, args); - } -} diff --git a/src/wixstdba/wixstdba.def b/src/wixstdba/wixstdba.def deleted file mode 100644 index ba9980d3..00000000 --- a/src/wixstdba/wixstdba.def +++ /dev/null @@ -1,10 +0,0 @@ -; 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. - - -EXPORTS - BootstrapperApplicationCreate - BootstrapperApplicationDestroy - DncPrereqBootstrapperApplicationCreate - DncPrereqBootstrapperApplicationDestroy - MbaPrereqBootstrapperApplicationCreate - MbaPrereqBootstrapperApplicationDestroy diff --git a/src/wixstdba/wixstdba.mc b/src/wixstdba/wixstdba.mc deleted file mode 100644 index 688b1da1..00000000 --- a/src/wixstdba/wixstdba.mc +++ /dev/null @@ -1,73 +0,0 @@ -; // 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. - - -MessageIdTypedef=DWORD - -LanguageNames=(English=0x409:MSG00409) - - -; // message definitions - -; // MessageId=# -; // Severity=Success -; // SymbolicName=MSG_SUCCESS -; // Language=English -; // Success %1. -; // . -; -; // MessageId=# -; // Severity=Warning -; // SymbolicName=MSG_WARNING -; // Language=English -; // Warning %1. -; // . -; -; // MessageId=# -; // Severity=Error -; // SymbolicName=MSG_ERROR -; // Language=English -; // Error %1. -; // . - -MessageId=1 -Severity=Success -SymbolicName=MSG_WIXSTDBA_PLANNED_FORWARD_COMPATIBLE_BUNDLE -Language=English -WIXSTDBA: Planned forward compatible bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! -. - -MessageId=2 -Severity=Success -SymbolicName=MSG_WIXSTDBA_PLANNED_PACKAGE -Language=English -WIXSTDBA: Planned package: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! -. - -MessageId=3 -Severity=Success -SymbolicName=MSG_WIXSTDBA_PLANNED_RELATED_BUNDLE -Language=English -WIXSTDBA: Planned related bundle: %1!ls!, wixstdba requested: %2!hs!, bafunctions requested: %3!hs! -. - -MessageId=5 -Severity=Success -SymbolicName=MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE -Language=English -WIXSTDBA: Planned target MSI package: %1!ls!, productCode: %2!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs! -. - -MessageId=6 -Severity=Success -SymbolicName=MSG_WIXSTDBA_PLANNED_MSI_FEATURE -Language=English -WIXSTDBA: Planned MSI feature: %2!ls! for %1!ls!, wixstdba requested: %3!hs!, bafunctions requested: %4!hs! -. - -MessageId=7 -Severity=Success -SymbolicName=MSG_WIXSTDBA_PLANNED_MSI_PACKAGE -Language=English -WIXSTDBA: Planned MSI package: %1!ls!, wixstdba requested: actionMsiProperty=%2!d!;uiLevel=%3!d!;disableExternalUiHandler=%4!hs!, bafunctions requested: actionMsiProperty=%5!d!;uiLevel=%6!d!;disableExternalUiHandler=%7!hs! -. - diff --git a/src/wixstdba/wixstdba.vcxproj b/src/wixstdba/wixstdba.vcxproj deleted file mode 100644 index 06b1c8d8..00000000 --- a/src/wixstdba/wixstdba.vcxproj +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - Debug - ARM64 - - - Release - ARM64 - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - {41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA} - DynamicLibrary - v142 - Unicode - WixStdBA - wixstdba.def - - - - - - - comctl32.lib;gdiplus.lib;msimg32.lib;shlwapi.lib;wininet.lib;wixstdba.res - - - - - Create - - - - - - - - - - - - - - - - - Compiling message file... - mc.exe -h "$(IntDir)." -r "$(IntDir)." -A -c -z wixstdba.messages "$(InputDir)wixstdba.mc" -rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc" - $(IntDir)wixstdba.messages.h;$(IntDir)wixstdba.messages.rc - - - - - - - - - - - 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/version.json b/version.json deleted file mode 100644 index 5f857771..00000000 --- a/version.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": "4.0", - "publicReleaseRefSpec": [ - "^refs/heads/master$" - ], - "cloudBuild": { - "buildNumber": { - "enabled": true - } - } -} -- cgit v1.2.3-55-g6feb