From 14987a72cc1a3493ca8f80693d273352fc314bd9 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 28 Apr 2021 19:33:49 -0500 Subject: Update dependencies. --- 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 +++++------ 11 files changed, 62 insertions(+), 53 deletions(-) (limited to 'src') 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