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
8 changes: 4 additions & 4 deletions dev/Deployment/DeploymentManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
// (i.e. if any of the target packages is not installed, GetStatus should return PackageInstallRequired).
HRESULT verifyResult{};

for (const auto package : c_targetPackages)
for (const auto &package : c_targetPackages)
{
// Build package family name based on the framework naming scheme.
std::wstring packageFamilyName{};
Expand Down Expand Up @@ -651,22 +651,22 @@ namespace winrt::Microsoft::Windows::ApplicationModel::WindowsAppRuntime::implem
auto dependencyPackage{ currentPackageInfo.Package(i) };

// Verify PublisherId matches.
if (CompareStringOrdinal(currentPackageInfo.Package(i).packageId.publisherId, -1, WINDOWSAPPRUNTIME_PACKAGE_PUBLISHERID, -1, TRUE) != CSTR_EQUAL)
if (CompareStringOrdinal(dependencyPackage.packageId.publisherId, -1, WINDOWSAPPRUNTIME_PACKAGE_PUBLISHERID, -1, TRUE) != CSTR_EQUAL)
{
continue;
}

// Verify that the WindowsAppRuntime prefix identifier is in the name.
// This should also be the beginning of the name, so its find position is expected to be 0.
std::wstring dependencyPackageName{ currentPackageInfo.Package(i).packageId.name };
std::wstring dependencyPackageName{ dependencyPackage.packageId.name };
if (dependencyPackageName.find(WINDOWSAPPRUNTIME_PACKAGE_NAME_PREFIX) != 0)
{
continue;
}

// On WindowsAppSDK 1.1+, there is no need to check and rule out Main, Singleton and DDLM Package identifiers as their names don't have a overlap with WINDOWSAPPRUNTIME_PACKAGE_NAME_PREFIX.

return hstring(currentPackageInfo.Package(i).packageFullName);
return hstring(dependencyPackage.packageFullName);
}

THROW_WIN32(ERROR_NOT_FOUND);
Expand Down
Loading