@joebigelow / wix-1 / commits / da29ddd4

Update dependencies.

Sean Hall committed Feb 22, 2021 at 20:42 UTC da29ddd42cf1e15de1f6332a7d17c598cd5a00d1

12 files changed +59 -60

global.json

+1 -1

@@ -1,6 +1,6 @@

1 {

2 "msbuild-sdks": {

3 - "WixToolset.Sdk": "4.0.0-build-0189"

3 + "WixToolset.Sdk": "4.0.0-build-0190"

4 },

5 "sdk": {

6 "allowPrerelease": false

src/Samples/bafunctions/bafunctions.vcxproj

+4 -4

@@ -2,8 +2,8 @@

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />

6 - <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props')" />

5 + <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" />

6 + <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" />

7 <Import Project="..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />

9 <ItemGroup Label="ProjectConfigurations">

@@ -73,8 +73,8 @@

73 <PropertyGroup>

74 <ErrorText>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}.</ErrorText>

75 </PropertyGroup>

76 - <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props'))" />

77 - <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props'))" />

76 + <Error Condition="!Exists('..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props'))" />

77 + <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props'))" />

78 <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />

79 <Error Condition="!Exists('..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />

80 </Target>

src/Samples/bafunctions/packages.config

+2 -2

@@ -1,7 +1,7 @@

1 <?xml version="1.0" encoding="utf-8"?>

2 <packages>

3 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />

4 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.80" targetFramework="native" />

5 - <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />

4 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />

5 + <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" />

6 <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />

7 </packages>

\ No newline at end of file

src/dnchost/dnchost.vcxproj

+4 -4

@@ -4,8 +4,8 @@

4 <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />

5 <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />

6 <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />

7 - <Import Project="..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />

8 - <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props')" />

7 + <Import Project="..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" />

8 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" />

9 <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />

10 <ItemGroup Label="ProjectConfigurations">

11 <ProjectConfiguration Include="Debug|ARM64">

@@ -99,8 +99,8 @@

99 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props'))" />

100 <Error Condition="!Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.targets'))" />

101 <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />

102 - <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props'))" />

103 - <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props'))" />

102 + <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props'))" />

103 + <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props'))" />

104 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />

105 </Target>

106 </Project>

\ No newline at end of file

src/dnchost/packages.config

+2 -2

@@ -7,7 +7,7 @@

7 <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />

8 <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />

9 <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />

10 - <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />

11 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.80" targetFramework="native" />

10 + <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" />

11 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />

12 <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />

13 </packages>

\ No newline at end of file

src/mbahost/mbahost.vcxproj

+4 -4

@@ -5,8 +5,8 @@

5 <Import Project="..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.GitHub.1.0.0\build\Microsoft.SourceLink.GitHub.props')" />

6 <Import Project="..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props" Condition="Exists('..\..\packages\Microsoft.SourceLink.Common.1.0.0\build\Microsoft.SourceLink.Common.props')" />

7 <Import Project="..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props" Condition="Exists('..\..\packages\Microsoft.Build.Tasks.Git.1.0.0\build\Microsoft.Build.Tasks.Git.props')" />

8 - <Import Project="..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />

9 - <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props')" />

8 + <Import Project="..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" />

9 + <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" />

10 <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />

12 <ItemGroup Label="ProjectConfigurations">

@@ -99,8 +99,8 @@

105 </Target>

106 </Project>

\ No newline at end of file

src/mbahost/packages.config

+2 -2

@@ -4,7 +4,7 @@

4 <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />

5 <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />

6 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />

7 - <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />

8 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.80" targetFramework="native" />

7 + <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" />

8 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />

9 <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />

10 </packages>

\ No newline at end of file

src/test/examples/TestEngine/Example.TestEngine.vcxproj

+4 -4

@@ -1,8 +1,8 @@

1 <?xml version="1.0" encoding="utf-8"?>

3 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

4 - <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" />

5 - <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props')" />

4 + <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" />

5 + <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" />

6 <Import Project="..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />

7 <ItemGroup Label="ProjectConfigurations">

8 <ProjectConfiguration Include="Debug|ARM64">

@@ -76,8 +76,8 @@

76 <ErrorText>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}.</ErrorText>

77 </PropertyGroup>

78 <Error Condition="!Exists('..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets'))" />

79 - <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.48\build\WixToolset.BalUtil.props'))" />

80 - <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.80\build\WixToolset.BootstrapperCore.Native.props'))" />

79 + <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props'))" />

80 + <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.89\build\WixToolset.BootstrapperCore.Native.props'))" />

81 <Error Condition="!Exists('..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props'))" />

82 </Target>

83 </Project>

\ No newline at end of file

src/test/examples/TestEngine/packages.config

+2 -2

@@ -1,7 +1,7 @@

1 <?xml version="1.0" encoding="utf-8"?>

2 <packages>

3 <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />

4 - <package id="WixToolset.BootstrapperCore.Native" version="4.0.80" targetFramework="native" />

5 - <package id="WixToolset.BalUtil" version="4.0.48" targetFramework="native" />

4 + <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />

5 + <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" />

6 <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />

7 </packages>

\ No newline at end of file

src/wixstdba/WixStandardBootstrapperApplication.cpp

+28 -29

@@ -383,6 +383,8 @@ public: // IBootstrapperApplication

383

384 virtual STDMETHODIMP OnPlanPackageBegin(

385 __in_z LPCWSTR wzPackageId,

386 + __in BOOTSTRAPPER_PACKAGE_STATE state,

387 + __in BOOL fInstallCondition,

388 __in BOOTSTRAPPER_REQUEST_STATE recommendedState,

389 __inout BOOTSTRAPPER_REQUEST_STATE *pRequestState,

390 __inout BOOL* pfCancel

@@ -392,7 +394,7 @@ public: // IBootstrapperApplication

394 WIXSTDBA_PACKAGE_INFO* pPackageInfo = NULL;

395 BAL_INFO_PACKAGE* pPackage = NULL;

396

395 - // If we're planning to install a prerequisite, install it. The prerequisite needs to be installed

397 + // If we're planning to install prerequisites, install them. The prerequisites need to be installed

398 // in all cases (even uninstall!) so the BA can load next.

399 if (m_fPrereq)

400 {

@@ -401,21 +403,7 @@ public: // IBootstrapperApplication

403 hr = GetPackageInfo(wzPackageId, &pPackageInfo, &pPackage);

404 if (SUCCEEDED(hr) && pPackage->fPrereqPackage && pPackageInfo)

405 {

404 - if (pPackage->sczInstallCondition && *pPackage->sczInstallCondition)

405 - {

406 - hr = BalEvaluateCondition(pPackage->sczInstallCondition, &fInstall);

407 - if (FAILED(hr))

408 - {

409 - fInstall = FALSE;

410 - }

411 - }

412 - else

413 - {

414 - // If the InstallCondition is missing, then it should always be installed.

415 - fInstall = TRUE;

416 - }

417 -

418 - pPackageInfo->fPlannedToBeInstalled = fInstall;

406 + pPackageInfo->fPlannedToBeInstalled = fInstall = fInstallCondition;

407 }

408

409 if (fInstall)

@@ -449,7 +437,7 @@ public: // IBootstrapperApplication

437 }

438 }

439

452 - return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, recommendedState, pRequestState, pfCancel);

440 + return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fInstallCondition, recommendedState, pRequestState, pfCancel);

441 }

442

443

@@ -1146,8 +1134,8 @@ public: // IBootstrapperApplication

1134 case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTRELATEDMSIPACKAGE:

1135 OnDetectRelatedMsiPackageFallback(reinterpret_cast<BA_ONDETECTRELATEDMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTRELATEDMSIPACKAGE_RESULTS*>(pvResults));

1136 break;

1149 - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTTARGETMSIPACKAGE:

1150 - OnDetectTargetMsiPackageFallback(reinterpret_cast<BA_ONDETECTTARGETMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTTARGETMSIPACKAGE_RESULTS*>(pvResults));

1137 + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTPATCHTARGET:

1138 + OnDetectPatchTargetFallback(reinterpret_cast<BA_ONDETECTPATCHTARGET_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTPATCHTARGET_RESULTS*>(pvResults));

1139 break;

1140 case BOOTSTRAPPER_APPLICATION_MESSAGE_ONDETECTMSIFEATURE:

1141 OnDetectMsiFeatureFallback(reinterpret_cast<BA_ONDETECTMSIFEATURE_ARGS*>(pvArgs), reinterpret_cast<BA_ONDETECTMSIFEATURE_RESULTS*>(pvResults));

@@ -1161,8 +1149,8 @@ public: // IBootstrapperApplication

1149 case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPACKAGEBEGIN:

1150 OnPlanPackageBeginFallback(reinterpret_cast<BA_ONPLANPACKAGEBEGIN_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANPACKAGEBEGIN_RESULTS*>(pvResults));

1151 break;

1164 - case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANTARGETMSIPACKAGE:

1165 - OnPlanTargetMsiPackageFallback(reinterpret_cast<BA_ONPLANTARGETMSIPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANTARGETMSIPACKAGE_RESULTS*>(pvResults));

1152 + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANPATCHTARGET:

1153 + OnPlanPatchTargetFallback(reinterpret_cast<BA_ONPLANPATCHTARGET_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANPATCHTARGET_RESULTS*>(pvResults));

1154 break;

1155 case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANMSIFEATURE:

1156 OnPlanMsiFeatureFallback(reinterpret_cast<BA_ONPLANMSIFEATURE_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANMSIFEATURE_RESULTS*>(pvResults));

@@ -1293,6 +1281,9 @@ public: // IBootstrapperApplication

1281 case BOOTSTRAPPER_APPLICATION_MESSAGE_ONSYSTEMRESTOREPOINTCOMPLETE:

1282 OnSystemRestorePointCompleteFallback(reinterpret_cast<BA_ONSYSTEMRESTOREPOINTCOMPLETE_ARGS*>(pvArgs), reinterpret_cast<BA_ONSYSTEMRESTOREPOINTCOMPLETE_RESULTS*>(pvResults));

1283 break;

1284 + case BOOTSTRAPPER_APPLICATION_MESSAGE_ONPLANNEDPACKAGE:

1285 + OnPlannedPackageFallback(reinterpret_cast<BA_ONPLANNEDPACKAGE_ARGS*>(pvArgs), reinterpret_cast<BA_ONPLANNEDPACKAGE_RESULTS*>(pvResults));

1286 + break;

1287 default:

1288 BalLog(BOOTSTRAPPER_LOG_LEVEL_STANDARD, "WIXSTDBA: Forwarding unknown BA message: %d", message);

1289 m_pfnBAFunctionsProc((BA_FUNCTIONS_MESSAGE)message, pvArgs, pvResults, m_pvBAFunctionsProcContext);

@@ -1408,12 +1399,12 @@ private: // privates

1399 m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTRELATEDMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext);

1400 }

1401

1411 - void OnDetectTargetMsiPackageFallback(

1412 - __in BA_ONDETECTTARGETMSIPACKAGE_ARGS* pArgs,

1413 - __inout BA_ONDETECTTARGETMSIPACKAGE_RESULTS* pResults

1402 + void OnDetectPatchTargetFallback(

1403 + __in BA_ONDETECTPATCHTARGET_ARGS* pArgs,

1404 + __inout BA_ONDETECTPATCHTARGET_RESULTS* pResults

1405 )

1406 {

1416 - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTTARGETMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext);

1407 + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONDETECTPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext);

1408 }

1409

1410 void OnDetectMsiFeatureFallback(

@@ -1452,13 +1443,13 @@ private: // privates

1443 BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_PACKAGE, m_hModule, pArgs->wzPackageId, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));

1444 }

1445

1455 - void OnPlanTargetMsiPackageFallback(

1456 - __in BA_ONPLANTARGETMSIPACKAGE_ARGS* pArgs,

1457 - __inout BA_ONPLANTARGETMSIPACKAGE_RESULTS* pResults

1446 + void OnPlanPatchTargetFallback(

1447 + __in BA_ONPLANPATCHTARGET_ARGS* pArgs,

1448 + __inout BA_ONPLANPATCHTARGET_RESULTS* pResults

1449 )

1450 {

1451 BOOTSTRAPPER_REQUEST_STATE requestedState = pResults->requestedState;

1461 - m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANTARGETMSIPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext);

1452 + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPATCHTARGET, pArgs, pResults, m_pvBAFunctionsProcContext);

1453 BalLogId(BOOTSTRAPPER_LOG_LEVEL_STANDARD, MSG_WIXSTDBA_PLANNED_TARGET_MSI_PACKAGE, m_hModule, pArgs->wzPackageId, pArgs->wzProductCode, LoggingRequestStateToString(requestedState), LoggingRequestStateToString(pResults->requestedState));

1454 }

1455

@@ -1480,6 +1471,14 @@ private: // privates

1471 m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANPACKAGECOMPLETE, pArgs, pResults, m_pvBAFunctionsProcContext);

1472 }

1473

1474 + void OnPlannedPackageFallback(

1475 + __in BA_ONPLANNEDPACKAGE_ARGS* pArgs,

1476 + __inout BA_ONPLANNEDPACKAGE_RESULTS* pResults

1477 + )

1478 + {

1479 + m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONPLANNEDPACKAGE, pArgs, pResults, m_pvBAFunctionsProcContext);

1480 + }

1481 +

1482 void OnApplyBeginFallback(

1483 __in BA_ONAPPLYBEGIN_ARGS* pArgs,

1484 __inout BA_ONAPPLYBEGIN_RESULTS* pResults

src/wixstdba/packages.config