Add scope support to more commands and add provisioning support for msix and msstore types #2766
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ryfu-msft
reviewed
Dec 16, 2022
| @@ -121,16 +133,29 @@ namespace AppInstaller::Repository::Microsoft | |||
| SQLiteIndex index = SQLiteIndex::CreateNew(SQLITE_MEMORY_DB_CONNECTION_TARGET, Schema::Version::Latest()); | |||
|
|
|||
| // Put installed packages into the index | |||
| if (filter == PredefinedInstalledSourceFactory::Filter::None || filter == PredefinedInstalledSourceFactory::Filter::ARP) | |||
| if (filter == PredefinedInstalledSourceFactory::Filter::None || filter == PredefinedInstalledSourceFactory::Filter::ARP || | |||
| filter == PredefinedInstalledSourceFactory::Filter::User || filter == PredefinedInstalledSourceFactory::Filter::Machine) | |||
| { | |||
There was a problem hiding this comment.
Is this done on purpose for readability? Could be simplified to:
if (filter != PredefinedInstalledSourceFactory::Filter::Msix)
There was a problem hiding this comment.
I think it'd be better to check expected values instead of "!=" so future additions of the enum will not accidentally change previous behavior
ryfu-msft
reviewed
Dec 16, 2022
Comment on lines
+150
to
159
| if (filter == PredefinedInstalledSourceFactory::Filter::None || | ||
| filter == PredefinedInstalledSourceFactory::Filter::MSIX || | ||
| filter == PredefinedInstalledSourceFactory::Filter::User) | ||
| { | ||
| PopulateIndexFromMSIX(index); | ||
| PopulateIndexFromMSIX(index, Manifest::ScopeEnum::User); | ||
| } | ||
| else if (filter == PredefinedInstalledSourceFactory::Filter::Machine) | ||
| { | ||
| PopulateIndexFromMSIX(index, Manifest::ScopeEnum::Machine); | ||
| } |
There was a problem hiding this comment.
if (filter != PredefinedInstalledSourceFactory::Filter::Arp)
{
if (filter == PredefinedInstalledSourceFactory::Filter::Machine)
{
PopulateIndexFromMSIX(index, Manifest::ScopeEnum::Machine);
}
else
{
PopulateIndexFromMSIX(index, Manifest::ScopeEnum::User);
}
}
ryfu-msft
reviewed
Dec 16, 2022
| ::AppInstaller::Repository::Source installedSource = ::AppInstaller::Repository::Source{ ::AppInstaller::Repository::PredefinedSource::Installed }; | ||
| ::AppInstaller::Repository::Source installedSource; | ||
| auto manifestInstalledScope = GetManifestScope(m_compositePackageCatalogOptions.InstalledScope()); | ||
| if (manifestInstalledScope.first == ::AppInstaller::Manifest::ScopeEnum::User) |
There was a problem hiding this comment.
NIT: seems like you can just assign manifestInstalledScope.first directly to the local variable.
ryfu-msft
reviewed
Dec 16, 2022
| if (installerType == InstallerTypeEnum::Portable || | ||
| installerType == InstallerTypeEnum::MSStore || | ||
| installerType == InstallerTypeEnum::Msix) | ||
| { |
There was a problem hiding this comment.
Use semantic check like IsAdminRequiredForMachineScopeInstall(installerType)
ryfu-msft
reviewed
Dec 16, 2022
| @@ -133,6 +134,11 @@ namespace AppInstaller::CLI::Workflow | |||
| installOptions.CompletedInstallToastNotificationMode(AppInstallationToastNotificationMode::NoToast); | |||
| } | |||
|
|
|||
| if (Manifest::ConvertToScopeEnum(context.Args.GetArg(Execution::Args::Type::InstallScope)) == Manifest::ScopeEnum::Machine) | |||
There was a problem hiding this comment.
If arg does not exist, the GetArg returns empty, no exception is thrown. I copied this snippet from existing usage in other places.
ryfu-msft
approved these changes
Dec 16, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Scope parameter in list, upgrade and uninstall commands works slightly differently from install and show commands.
Show, install commands: scope parameter is to filter the installer selection
List, upgrade and uninstall: scope parameter is to filter the installed package selection, for upgrade, that means the package to upgrade is also filtered to the scope due to the InstalledScopeFilter in ManifestComparator
Microsoft Reviewers: Open in CodeFlow