From c01cfd807219d3ea96ad171cdbe5dd9d4a4aced0 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Thu, 4 Feb 2021 21:38:19 -0600 Subject: Update dependencies. --- 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 ++--- 24 files changed, 44 insertions(+), 85 deletions(-) (limited to 'src') 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