Replace OnResolveSource with OnCacheAcquireResolving.
#3640
Sean Hall committed
Apr 19, 2021 at 18:27 UTC
1fb8dc635834c5b9f24b898a291734d7bd136ad4
11 files changed
+67
-74
src/Samples/bafunctions/bafunctions.vcxproj
+4
-4
@@ -2,8 +2,8 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <Import Project="..\..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props')" />
6
- <Import Project="..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props')" />
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')" />
8
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.55\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props'))" />
77
- <Error Condition="!Exists('..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props'))" />
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'))" />
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.110" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.55" targetFramework="native" />
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" />
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.55\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props')" />
8
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.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')" />
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.55\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props'))" />
103
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props'))" />
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'))" />
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.55" targetFramework="native" />
11
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.110" 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" />
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.55\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props')" />
9
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.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')" />
11
12
<ItemGroup Label="ProjectConfigurations">
@@ -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.55\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props'))" />
103
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props'))" />
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'))" />
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.55" targetFramework="native" />
8
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.110" targetFramework="native" />
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" />
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"?>
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props" Condition="Exists('..\..\..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props')" />
5
- <Import Project="..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props')" />
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')" />
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.55\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props'))" />
80
- <Error Condition="!Exists('..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props'))" />
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'))" />
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.110" targetFramework="native" />
5
- <package id="WixToolset.BalUtil" version="4.0.55" targetFramework="native" />
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" />
7
</packages>
\ No newline at end of file
src/wixstdba/WixStandardBootstrapperApplication.cpp
+37
-44
@@ -945,55 +945,48 @@ public: // IBootstrapperApplication
945
}
946
947
948
- virtual STDMETHODIMP OnResolveSource(
949
- __in_z LPCWSTR wzPackageOrContainerId,
948
+ virtual STDMETHODIMP OnCacheAcquireResolving(
949
+ __in_z_opt LPCWSTR wzPackageOrContainerId,
950
__in_z_opt LPCWSTR wzPayloadId,
951
- __in_z LPCWSTR wzLocalSource,
952
- __in_z_opt LPCWSTR wzDownloadSource,
953
- __in BOOTSTRAPPER_RESOLVESOURCE_ACTION /*recommendation*/,
954
- __inout BOOTSTRAPPER_RESOLVESOURCE_ACTION* pAction,
951
+ __in_z LPCWSTR* rgSearchPaths,
952
+ __in DWORD /*cSearchPaths*/,
953
+ __in BOOL /*fFoundLocal*/,
954
+ __in DWORD dwRecommendedSearchPath,
955
+ __in_z_opt LPCWSTR /*wzDownloadUrl*/,
956
+ __in_z_opt LPCWSTR /*wzPayloadContainerId*/,
957
+ __in BOOTSTRAPPER_CACHE_RESOLVE_OPERATION /*recommendation*/,
958
+ __inout DWORD* /*pdwChosenSearchPath*/,
959
+ __inout BOOTSTRAPPER_CACHE_RESOLVE_OPERATION* pAction,
960
__inout BOOL* pfCancel
961
)
962
{
963
HRESULT hr = S_OK;
964
960
- if (BOOTSTRAPPER_DISPLAY_FULL == m_command.display)
965
+ if (BOOTSTRAPPER_CACHE_RESOLVE_NONE == *pAction && BOOTSTRAPPER_DISPLAY_FULL == m_command.display) // prompt to change the source location.
966
{
962
- if (wzDownloadSource)
963
- {
964
- *pAction = BOOTSTRAPPER_RESOLVESOURCE_ACTION_DOWNLOAD;
965
- }
966
- else // prompt to change the source location.
967
- {
968
- OPENFILENAMEW ofn = { };
969
- WCHAR wzFile[MAX_PATH] = { };
967
+ OPENFILENAMEW ofn = { };
968
+ WCHAR wzFile[MAX_PATH] = { };
969
971
- ::StringCchCopyW(wzFile, countof(wzFile), wzLocalSource);
970
+ ::StringCchCopyW(wzFile, countof(wzFile), rgSearchPaths[dwRecommendedSearchPath]);
971
973
- ofn.lStructSize = sizeof(ofn);
974
- ofn.hwndOwner = m_hWnd;
975
- ofn.lpstrFile = wzFile;
976
- ofn.nMaxFile = countof(wzFile);
977
- ofn.lpstrFilter = L"All Files\0*.*\0";
978
- ofn.nFilterIndex = 1;
979
- ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
980
- ofn.lpstrTitle = m_pTheme->sczCaption;
972
+ ofn.lStructSize = sizeof(ofn);
973
+ ofn.hwndOwner = m_hWnd;
974
+ ofn.lpstrFile = wzFile;
975
+ ofn.nMaxFile = countof(wzFile);
976
+ ofn.lpstrFilter = L"All Files\0*.*\0";
977
+ ofn.nFilterIndex = 1;
978
+ ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST;
979
+ ofn.lpstrTitle = m_pTheme->sczCaption;
980
982
- if (::GetOpenFileNameW(&ofn))
983
- {
984
- hr = m_pEngine->SetLocalSource(wzPackageOrContainerId, wzPayloadId, ofn.lpstrFile);
985
- *pAction = BOOTSTRAPPER_RESOLVESOURCE_ACTION_RETRY;
986
- }
987
- else
988
- {
989
- *pfCancel = TRUE;
990
- }
981
+ if (::GetOpenFileNameW(&ofn))
982
+ {
983
+ hr = m_pEngine->SetLocalSource(wzPackageOrContainerId, wzPayloadId, ofn.lpstrFile);
984
+ *pAction = BOOTSTRAPPER_CACHE_RESOLVE_RETRY;
985
+ }
986
+ else
987
+ {
988
+ *pfCancel = TRUE;
989
}
992
- }
993
- else if (wzDownloadSource)
994
- {
995
- // If doing a non-interactive install and download source is available, let's try downloading the package silently
996
- *pAction = BOOTSTRAPPER_RESOLVESOURCE_ACTION_DOWNLOAD;
990
}
991
// else there's nothing more we can do in non-interactive mode
992
@@ -1196,8 +1189,8 @@ public: // IBootstrapperApplication
1189
case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIREPROGRESS:
1190
OnCacheAcquireProgressFallback(reinterpret_cast<BA_ONCACHEACQUIREPROGRESS_ARGS*>(pvArgs), reinterpret_cast<BA_ONCACHEACQUIREPROGRESS_RESULTS*>(pvResults));
1191
break;
1199
- case BOOTSTRAPPER_APPLICATION_MESSAGE_ONRESOLVESOURCE:
1200
- OnResolveSourceFallback(reinterpret_cast<BA_ONRESOLVESOURCE_ARGS*>(pvArgs), reinterpret_cast<BA_ONRESOLVESOURCE_RESULTS*>(pvResults));
1192
+ case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIRERESOLVING:
1193
+ OnCacheAcquireResolvingFallback(reinterpret_cast<BA_ONCACHEACQUIRERESOLVING_ARGS*>(pvArgs), reinterpret_cast<BA_ONCACHEACQUIRERESOLVING_RESULTS*>(pvResults));
1194
break;
1195
case BOOTSTRAPPER_APPLICATION_MESSAGE_ONCACHEACQUIRECOMPLETE:
1196
OnCacheAcquireCompleteFallback(reinterpret_cast<BA_ONCACHEACQUIRECOMPLETE_ARGS*>(pvArgs), reinterpret_cast<BA_ONCACHEACQUIRECOMPLETE_RESULTS*>(pvResults));
@@ -1570,12 +1563,12 @@ private: // privates
1563
m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIREPROGRESS, pArgs, pResults, m_pvBAFunctionsProcContext);
1564
}
1565
1573
- void OnResolveSourceFallback(
1574
- __in BA_ONRESOLVESOURCE_ARGS* pArgs,
1575
- __inout BA_ONRESOLVESOURCE_RESULTS* pResults
1566
+ void OnCacheAcquireResolvingFallback(
1567
+ __in BA_ONCACHEACQUIRERESOLVING_ARGS* pArgs,
1568
+ __inout BA_ONCACHEACQUIRERESOLVING_RESULTS* pResults
1569
)
1570
{
1578
- m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONRESOLVESOURCE, pArgs, pResults, m_pvBAFunctionsProcContext);
1571
+ m_pfnBAFunctionsProc(BA_FUNCTIONS_MESSAGE_ONCACHEACQUIRERESOLVING, pArgs, pResults, m_pvBAFunctionsProcContext);
1572
}
1573
1574
void OnCacheAcquireCompleteFallback(
src/wixstdba/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.55" targetFramework="native" />
8
- <package id="WixToolset.BootstrapperCore.Native" version="4.0.110" targetFramework="native" />
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" />
10
</packages>
\ No newline at end of file
src/wixstdba/wixstdba.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.55\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props')" />
9
- <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.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')" />
11
12
<ItemGroup Label="ProjectConfigurations">
@@ -94,8 +94,8 @@ rc.exe -fo "$(OutDir)wixstdba.res" "$(IntDir)wixstdba.messages.rc"</Command>
94
<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'))" />
95
<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'))" />
96
<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'))" />
97
- <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.55\build\WixToolset.BalUtil.props'))" />
98
- <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.110\build\WixToolset.BootstrapperCore.Native.props'))" />
97
+ <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'))" />
98
+ <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'))" />
99
<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'))" />
100
</Target>
101
</Project>
\ No newline at end of file