Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions dev/Deployment/DeploymentManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem

// Loop through all of the target packages (i.e. main, signleton packages) and capture whether they are all installed or not
// (i.e. if any of the target packages is not installed, GetStatus should return PackageInstallRequired).
HRESULT statusHResult{};
HRESULT verifyResult{};

for (const auto package : c_targetPackages)
{
Expand All @@ -134,15 +134,15 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
// Get target version based on the framework.
auto targetPackageVersion{ frameworkPackageInfo.Package(0).packageId.version };

auto verifyResult = VerifyPackage(packageFamilyName, targetPackageVersion, package.identifier);
verifyResult = VerifyPackage(packageFamilyName, targetPackageVersion, package.identifier);
if (FAILED(verifyResult))
{
statusHResult = verifyResult;
break;
}
}

DeploymentStatus status{};
if (SUCCEEDED(statusHResult))
if (SUCCEEDED(verifyResult))
{
status = DeploymentStatus::Ok;
}
Expand All @@ -151,7 +151,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
status = DeploymentStatus::PackageInstallRequired;
}

return winrt::make<implementation::DeploymentResult>(status, statusHResult);
return winrt::make<implementation::DeploymentResult>(status, verifyResult);
}

winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::DeploymentResult DeploymentManager::Initialize(
Expand Down