8 files changed, 37 insertions, 16 deletions

diff --git a/src/api/api.cmd b/src/api/api.cmd
index 42ca8567..66b25a65 100644
--- a/src/api/api.cmd
+++ b/src/api/api.cmd
@@ -27,8 +27,8 @@ msbuild api_t.proj -p:Configuration=%_C% -tl -nologo -warnaserror -bl:%_L%\api_b
 
 :: Test
 dotnet test ^
- %_B%\net8.0\WixToolsetTest.Data.dll ^
- %_B%\net8.0\win-x86\WixToolsetTest.BootstrapperApplicationApi.dll ^
+ %_B%\net10.0\WixToolsetTest.Data.dll ^
+ %_B%\net10.0\win-x86\WixToolsetTest.BootstrapperApplicationApi.dll ^
  %_B%\x86\BalUtilUnitTest.dll ^
  %_B%\x86\BextUtilUnitTest.dll ^
  --nologo -l "trx;LogFileName=%_L%\TestResults\api.trx" || exit /b
diff --git a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
index 398a16b7..6076c714 100644
--- a/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
+++ b/src/api/burn/WixToolset.BootstrapperApplicationApi/WixToolset.BootstrapperApplicationApi.nuspec
@@ -37,15 +37,15 @@
     <file src="netstandard2.0\$id$.dll" target="lib\netstandard2.0" />
     <file src="netstandard2.0\$id$.xml" target="lib\netstandard2.0" />
 
-    <file src="v143\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
-    <file src="v143\x64\mbanative.dll" target="runtimes\win-x64\native" />
-    <file src="v143\x86\mbanative.dll" target="runtimes\win-x86\native" />
+    <file src="v145\ARM64\mbanative.dll" target="runtimes\win-arm64\native" />
+    <file src="v145\x64\mbanative.dll" target="runtimes\win-x64\native" />
+    <file src="v145\x86\mbanative.dll" target="runtimes\win-x86\native" />
 
     <file src="$projectFolder$\..\balutil\inc\*" target="build\native\include" />
     <file src="$projectFolder$\..\inc\BootstrapperApplicationTypes.h" target="build\native\include" />
     <file src="$projectFolder$\..\inc\BootstrapperEngineTypes.h" target="build\native\include" />
-    <file src="v143\x86\balutil.lib" target="build\native\v14\x86" />
-    <file src="v143\x64\balutil.lib" target="build\native\v14\x64" />
-    <file src="v143\ARM64\balutil.lib" target="build\native\v14\ARM64" />
+    <file src="v145\x86\balutil.lib" target="build\native\v14\x86" />
+    <file src="v145\x64\balutil.lib" target="build\native\v14\x64" />
+    <file src="v145\ARM64\balutil.lib" target="build\native\v14\ARM64" />
   </files>
 </package>
diff --git a/src/api/burn/balutil/balinfo.cpp b/src/api/burn/balutil/balinfo.cpp
index ff0dfd9f..bff848c7 100644
--- a/src/api/burn/balutil/balinfo.cpp
+++ b/src/api/burn/balutil/balinfo.cpp
@@ -124,14 +124,32 @@ DAPI_(HRESULT) BalInfoParseFromXml(
     HRESULT hr = S_OK;
     IXMLDOMNode* pNode = NULL;
     BOOL fXmlFound = FALSE;
+    LPWSTR scz = NULL;
 
     hr = XmlSelectSingleNode(pixdManifest, L"/BootstrapperApplicationData/WixBundleProperties", &pNode);
     BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to select bundle information.");
 
     if (fXmlFound)
     {
-        hr = XmlGetYesNoAttribute(pNode, L"PerMachine", &pBundle->fPerMachine);
-        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to read bundle information per-machine.");
+        hr = XmlGetAttributeEx(pNode, L"Scope", &scz);
+        BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to read bundle information scope.");
+
+        if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"perMachine", -1, TRUE))
+        {
+            pBundle->scope = BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE;
+        }
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"perUser", -1, TRUE))
+        {
+            pBundle->scope = BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER;
+        }
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"perUserOrMachine", -1, TRUE))
+        {
+            pBundle->scope = BOOTSTRAPPER_PACKAGE_SCOPE_PER_USER_OR_PER_MACHINE;
+        }
+        else if (CSTR_EQUAL == ::CompareStringOrdinal(scz, -1, L"perMachineOrUser", -1, TRUE))
+        {
+            pBundle->scope = BOOTSTRAPPER_PACKAGE_SCOPE_PER_MACHINE_OR_PER_USER;
+        }
 
         hr = XmlGetAttributeEx(pNode, L"DisplayName", &pBundle->sczName);
         BalExitOnOptionalXmlQueryFailure(hr, fXmlFound, "Failed to read bundle information display name.");
@@ -150,6 +168,7 @@ DAPI_(HRESULT) BalInfoParseFromXml(
     BalExitOnFailure(hr, "Failed to parse bal package information from bootstrapper application data.");
 
 LExit:
+    ReleaseStr(scz);
     ReleaseObject(pNode);
 
     return hr;
diff --git a/src/api/burn/balutil/inc/balinfo.h b/src/api/burn/balutil/inc/balinfo.h
index 8baee844..110fb688 100644
--- a/src/api/burn/balutil/inc/balinfo.h
+++ b/src/api/burn/balutil/inc/balinfo.h
@@ -93,7 +93,7 @@ typedef struct _BAL_INFO_OVERRIDABLE_VARIABLES
 
 typedef struct _BAL_INFO_BUNDLE
 {
-    BOOL fPerMachine;
+    BOOTSTRAPPER_PACKAGE_SCOPE scope;
     LPWSTR sczName;
     LPWSTR sczLogVariable;
     BAL_INFO_PACKAGES packages;
diff --git a/src/api/burn/balutil/msg.cpp b/src/api/burn/balutil/msg.cpp
index b728cc83..b37cce8c 100644
--- a/src/api/burn/balutil/msg.cpp
+++ b/src/api/burn/balutil/msg.cpp
@@ -513,6 +513,8 @@ static HRESULT OnCacheAcquireResolving(
     hr = BuffReaderReadString(pReaderArgs, &sczDownloadUrl);
     ExitOnFailure(hr, "Failed to read download url of OnCacheAcquireResolving args.");
 
+    args.wzDownloadUrl = sczDownloadUrl;
+
     hr = BuffReaderReadString(pReaderArgs, &sczPayloadContainerId);
     ExitOnFailure(hr, "Failed to read payload container id of OnCacheAcquireResolving args.");
 
diff --git a/src/api/burn/bextutil/bextutil.nuspec b/src/api/burn/bextutil/bextutil.nuspec
index 6efdf0fc..83fa4e79 100644
--- a/src/api/burn/bextutil/bextutil.nuspec
+++ b/src/api/burn/bextutil/bextutil.nuspec
@@ -28,8 +28,8 @@
     <file src="$projectFolder$\inc\*" target="build\native\include" />
     <file src="$projectFolder$\..\inc\BootstrapperExtensionTypes.h" target="build\native\include" />
     <file src="$projectFolder$\..\inc\BootstrapperExtensionEngineTypes.h" target="build\native\include" />
-    <file src="..\..\v143\x86\bextutil.lib" target="build\native\v14\x86" />
-    <file src="..\..\v143\x64\bextutil.lib" target="build\native\v14\x64" />
-    <file src="..\..\v143\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
+    <file src="..\..\v145\x86\bextutil.lib" target="build\native\v14\x86" />
+    <file src="..\..\v145\x64\bextutil.lib" target="build\native\v14\x64" />
+    <file src="..\..\v145\ARM64\bextutil.lib" target="build\native\v14\ARM64" />
   </files>
 </package>
diff --git a/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj
index 4b2d273b..b53a50b3 100644
--- a/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj
+++ b/src/api/burn/test/WixToolsetTest.BootstrapperApplicationApi/WixToolsetTest.BootstrapperApplicationApi.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
     <SelfContained>false</SelfContained>
     <IsWixTestProject>true</IsWixTestProject>
diff --git a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
index 688e23f5..a1d8103b 100644
--- a/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
+++ b/src/api/wix/test/WixToolsetTest.Data/WixToolsetTest.Data.csproj
@@ -3,7 +3,7 @@
 
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>