Update dependencies and integrate changes.

3 files changed, 11 insertions, 30 deletions

diff --git a/src/dnchost/dnchost.cpp b/src/dnchost/dnchost.cpp
index 503537c0..8ca326fc 100644
--- a/src/dnchost/dnchost.cpp
+++ b/src/dnchost/dnchost.cpp
@@ -169,9 +169,6 @@ static HRESULT LoadDncConfiguration(
     HRESULT hr = S_OK;
     IXMLDOMDocument* pixdManifest = NULL;
     IXMLDOMNode* pixnHost = NULL;
-    IXMLDOMNode* pixnPayload = NULL;
-    LPWSTR sczPayloadId = NULL;
-    LPWSTR sczPayloadXPath = NULL;
     LPWSTR sczPayloadName = NULL;
     DWORD dwBool = 0;
 
@@ -187,21 +184,8 @@ static HRESULT LoadDncConfiguration(
         BalExitOnRootFailure(hr, "Failed to find WixBalBAFactoryAssembly element in bootstrapper application config.");
     }
 
-    hr = XmlGetAttributeEx(pixnHost, L"PayloadId", &sczPayloadId);
-    BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@PayloadId.");
-
-    hr = StrAllocFormatted(&sczPayloadXPath, L"/BootstrapperApplicationData/WixPayloadProperties[@Payload='%ls']", sczPayloadId);
-    BalExitOnFailure(hr, "Failed to format BAFactoryAssembly payload XPath.");
-
-    hr = XmlSelectSingleNode(pixdManifest, sczPayloadXPath, &pixnPayload);
-    if (S_FALSE == hr)
-    {
-        hr = E_NOTFOUND;
-    }
-    BalExitOnFailure(hr, "Failed to find WixPayloadProperties node for BAFactoryAssembly PayloadId: %ls.", sczPayloadId);
-
-    hr = XmlGetAttributeEx(pixnPayload, L"Name", &sczPayloadName);
-    BalExitOnFailure(hr, "Failed to get BAFactoryAssembly payload Name.");
+    hr = XmlGetAttributeEx(pixnHost, L"FilePath", &sczPayloadName);
+    BalExitOnFailure(hr, "Failed to get WixBalBAFactoryAssembly/@FilePath.");
 
     hr = PathConcat(pArgs->pCommand->wzBootstrapperWorkingFolder, sczPayloadName, &pState->sczBaFactoryAssemblyPath);
     BalExitOnFailure(hr, "Failed to create BaFactoryAssemblyPath.");
@@ -250,9 +234,6 @@ static HRESULT LoadDncConfiguration(
 
 LExit:
     ReleaseStr(sczPayloadName);
-    ReleaseObject(pixnPayload);
-    ReleaseStr(sczPayloadXPath);
-    ReleaseStr(sczPayloadId);
     ReleaseObject(pixnHost);
     ReleaseObject(pixdManifest);
 
diff --git a/src/dnchost/dnchost.vcxproj b/src/dnchost/dnchost.vcxproj
index 9c04849c..c5b6b416 100644
--- a/src/dnchost/dnchost.vcxproj
+++ b/src/dnchost/dnchost.vcxproj
@@ -4,9 +4,9 @@
   <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')" />
   <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')" />
   <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')" />
-  <Import Project="..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.49\build\WixToolset.BalUtil.props')" />
-  <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')" />
-  <Import Project="..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.62\build\WixToolset.DUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props" Condition="Exists('..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props')" />
+  <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" />
+  <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -99,8 +99,8 @@
     <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'))" />
     <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'))" />
     <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'))" />
-    <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'))" />
-    <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'))" />
-    <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'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BalUtil.4.0.50\build\WixToolset.BalUtil.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.94\build\WixToolset.BootstrapperCore.Native.props'))" />
+    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />
   </Target>
 </Project>
\ No newline at end of file
diff --git a/src/dnchost/packages.config b/src/dnchost/packages.config
index f60d813a..61787995 100644
--- a/src/dnchost/packages.config
+++ b/src/dnchost/packages.config
@@ -7,7 +7,7 @@
   <package id="runtime.win-arm64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
   <package id="runtime.win-x64.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
   <package id="runtime.win-x86.Microsoft.NETCore.DotNetAppHost" version="5.0.0" targetFramework="native" />
-  <package id="WixToolset.BalUtil" version="4.0.49" targetFramework="native" />
-  <package id="WixToolset.BootstrapperCore.Native" version="4.0.89" targetFramework="native" />
-  <package id="WixToolset.DUtil" version="4.0.62" targetFramework="native" />
+  <package id="WixToolset.BalUtil" version="4.0.50" targetFramework="native" />
+  <package id="WixToolset.BootstrapperCore.Native" version="4.0.94" targetFramework="native" />
+  <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />
 </packages>
\ No newline at end of file