@joebigelow / wix / commits / 14987a72

Update dependencies.

Sean Hall committed Apr 28, 2021 at 19:33 UTC 14987a72cc1a3493ca8f80693d273352fc314bd9

12 files changed +63 -54

global.json

+1 -1

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

1 {

2 "msbuild-sdks": {

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

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

4 },

5 "sdk": {

6 "allowPrerelease": false

src/Samples/bafunctions/bafunctions.vcxproj

+6 -6

@@ -2,9 +2,9 @@

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

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

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

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

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

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

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

9 <ItemGroup Label="ProjectConfigurations">

10 <ProjectConfiguration Include="Debug|ARM64">

@@ -73,9 +73,9 @@

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.57\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.57\build\WixToolset.BalUtil.props'))" />

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

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

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

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

78 + <Error Condition="!Exists('..\..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.DUtil.4.0.72\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>

81 </Project>

src/Samples/bafunctions/packages.config

+3 -3

@@ -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.132" targetFramework="native" />

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

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

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

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

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

7 </packages>

\ No newline at end of file

src/dnchost/dnchost.vcxproj

+6 -6

@@ -4,9 +4,9 @@

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.57\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.57\build\WixToolset.BalUtil.props')" />

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

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

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

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

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

10 <ItemGroup Label="ProjectConfigurations">

11 <ProjectConfiguration Include="Debug|ARM64">

12 <Configuration>Debug</Configuration>

@@ -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.57\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.57\build\WixToolset.BalUtil.props'))" />

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

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

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

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

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

105 </Target>

106 </Project>

\ No newline at end of file

src/dnchost/packages.config

+3 -3

@@ -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.57" targetFramework="native" />

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

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

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

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

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

13 </packages>

\ No newline at end of file

src/mbahost/mbahost.vcxproj

+6 -6

@@ -5,9 +5,9 @@

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.57\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.57\build\WixToolset.BalUtil.props')" />

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

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

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

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

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

12 <ItemGroup Label="ProjectConfigurations">

13 <ProjectConfiguration Include="Debug|ARM64">

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

105 </Target>

106 </Project>

\ No newline at end of file

src/mbahost/packages.config

+3 -3

@@ -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.57" targetFramework="native" />

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

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

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

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

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

10 </packages>

\ No newline at end of file

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

+6 -6

@@ -1,9 +1,9 @@

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.57\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.57\build\WixToolset.BalUtil.props')" />

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

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

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

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

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

7 <ItemGroup Label="ProjectConfigurations">

8 <ProjectConfiguration Include="Debug|ARM64">

9 <Configuration>Debug</Configuration>

@@ -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.57\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.57\build\WixToolset.BalUtil.props'))" />

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

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

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

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

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

82 </Target>

83 </Project>

\ No newline at end of file

src/test/examples/TestEngine/packages.config

+3 -3

@@ -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.132" targetFramework="native" />

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

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

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

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

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

7 </packages>

\ No newline at end of file

src/wixstdba/WixStandardBootstrapperApplication.cpp

+17 -8

@@ -389,9 +389,12 @@ public: // IBootstrapperApplication

389 virtual STDMETHODIMP OnPlanPackageBegin(

390 __in_z LPCWSTR wzPackageId,

391 __in BOOTSTRAPPER_PACKAGE_STATE state,

392 - __in BOOL fInstallCondition,

392 + __in BOOL fCached,

393 + __in BOOTSTRAPPER_PACKAGE_CONDITION_RESULT installCondition,

394 __in BOOTSTRAPPER_REQUEST_STATE recommendedState,

394 - __inout BOOTSTRAPPER_REQUEST_STATE *pRequestState,

395 + __in BOOTSTRAPPER_CACHE_TYPE recommendedCacheType,

396 + __inout BOOTSTRAPPER_REQUEST_STATE* pRequestState,

397 + __inout BOOTSTRAPPER_CACHE_TYPE* pRequestedCacheType,

398 __inout BOOL* pfCancel

399 )

400 {

@@ -408,7 +411,7 @@ public: // IBootstrapperApplication

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

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

413 {

411 - pPackageInfo->fPlannedToBeInstalled = fInstall = fInstallCondition;

414 + pPackageInfo->fPlannedToBeInstalled = fInstall = BOOTSTRAPPER_PACKAGE_CONDITION_FALSE != installCondition;

415 }

416

417 if (fInstall)

@@ -419,6 +422,12 @@ public: // IBootstrapperApplication

422 {

423 *pRequestState = BOOTSTRAPPER_REQUEST_STATE_NONE;

424 }

425 +

426 + // Don't force cache packages while installing prerequisites.

427 + if (BOOTSTRAPPER_CACHE_TYPE_FORCE == *pRequestedCacheType)

428 + {

429 + *pRequestedCacheType = BOOTSTRAPPER_CACHE_TYPE_KEEP;

430 + }

431 }

432 else if (m_sczAfterForcedRestartPackage) // after force restart, skip packages until after the package that caused the restart.

433 {

@@ -442,7 +451,7 @@ public: // IBootstrapperApplication

451 }

452 }

453

445 - return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fInstallCondition, recommendedState, pRequestState, pfCancel);

454 + return CBalBaseBootstrapperApplication::OnPlanPackageBegin(wzPackageId, state, fCached, installCondition, recommendedState, recommendedCacheType, pRequestState, pRequestedCacheType, pfCancel);

455 }

456

457

@@ -2247,7 +2256,7 @@ private: // privates

2256 LPCWSTR wzLocFileName = m_fPrereq ? L"mbapreq.wxl" : L"thm.wxl";

2257

2258 // Find and load .wxl file.

2250 - hr = LocProbeForFileEx(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath, TRUE);

2259 + hr = LocProbeForFile(wzModulePath, wzLocFileName, wzLanguage, &sczLocPath);

2260 BalExitOnFailure(hr, "Failed to probe for loc file: %ls in path: %ls", wzLocFileName, wzModulePath);

2261

2262 hr = LocLoadFromFile(sczLocPath, &m_pWixLoc);

@@ -2294,7 +2303,7 @@ private: // privates

2303 LPWSTR sczThemePath = NULL;

2304 LPCWSTR wzThemeFileName = m_fPrereq ? L"mbapreq.thm" : L"thm.xml";

2305

2297 - hr = LocProbeForFileEx(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath, TRUE);

2306 + hr = LocProbeForFile(wzModulePath, wzThemeFileName, wzLanguage, &sczThemePath);

2307 BalExitOnFailure(hr, "Failed to probe for theme file: %ls in path: %ls", wzThemeFileName, wzModulePath);

2308

2309 hr = ThemeLoadFromFile(sczThemePath, &m_pTheme);

@@ -2960,7 +2969,7 @@ private: // privates

2969 hr = StrAllocString(&sczLicenseFilename, PathFile(sczLicenseFormatted), 0);

2970 if (SUCCEEDED(hr))

2971 {

2963 - hr = LocProbeForFileEx(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath, TRUE);

2972 + hr = LocProbeForFile(sczLicenseDirectory, sczLicenseFilename, m_sczLanguage, &sczLicensePath);

2973 if (SUCCEEDED(hr))

2974 {

2975 hr = ThemeLoadRichEditFromFile(m_pTheme, WIXSTDBA_CONTROL_EULA_RICHEDIT, sczLicensePath, m_hModule);

@@ -3477,7 +3486,7 @@ private: // privates

3486 hr = PathGetDirectory(sczLicensePath, &sczLicenseDirectory);

3487 if (SUCCEEDED(hr))

3488 {

3480 - hr = LocProbeForFileEx(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath, TRUE);

3489 + hr = LocProbeForFile(sczLicenseDirectory, PathFile(sczLicenseUrl), m_sczLanguage, &sczLicensePath);

3490 }

3491 }

3492 }

src/wixstdba/packages.config