Skip to content

Use IsPackagedProcess() for package detection in PRI fallback #6500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guimafelipe wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −1
Open

Use IsPackagedProcess() for package detection in PRI fallback #6500

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion dev/MRTCore/mrt/Microsoft.Windows.ApplicationModel.Resources/src/Helper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

#include "pch.h"
#include "frameworkudk\ResourceManager.h"
#include <AppModel.Identity.IsPackagedProcess.h>

bool IsResourceNotFound(HRESULT hr)
{
Expand Down Expand Up @@ -83,7 +84,7 @@ HRESULT GetDefaultPriFile(winrt::hstring& filePath)

// GetDefaultPriFileForCurrentPackage will not handle the new case where
// resources.pri is in the parent folder.
bool isPackaged = (hr != HRESULT_FROM_WIN32(APPMODEL_ERROR_NO_PACKAGE));
bool isPackaged = AppModel::Identity::IsPackagedProcess();
hr = GetDefaultPriFileForCurentModule(isPackaged, filePath);

// Sparse-packaged apps have identity but deploy PRI files as loose files; fall back to unpackaged discovery which also searches for "[modulename].pri".
Expand Down
Loading