Add experimental support for multiple installed versions

.github/actions/spelling/excludes.txt

@@ -91,5 +91,6 @@
 # Because it doesn't handle argument -Words well
 ^src/PowerShell/tests/
 ^tools/CorrelationTestbed/.*\.ps1$
+^tools/DevInSandbox/.*\.ps1$
 ^tools/COMTrace/ComTrace.wprp$
 ignore$

doc/Settings.md

@@ -280,17 +280,6 @@ You can enable the feature as shown below.
    },
 ```
 
-### configuration
-
-This feature enables the configuration commands. These commands allow configuring the system into a desired state.
-You can enable the feature as shown below.
-
-```json
-   "experimentalFeatures": {
-       "configuration": true
-   },
-```
-
 ### resume
 
 This feature enables support for some commands to resume.
@@ -323,3 +312,14 @@ You can enable the feature as shown below.
        "proxy": true
    },
 ```
+
+### sideBySide
+
+This feature enables experimental improvements for supporting multiple instances of a package being installed on a system.
+You can enable the feature as shown below.
+
+```json
+   "experimentalFeatures": {
+       "sideBySide": true
+   },
+```

schemas/JSON/settings/settings.schema.0.2.json

@@ -275,6 +275,11 @@
           "description": "Enable support for proxies",
           "type": "boolean",
           "default": false
+        },
+        "sideBySide": {
+          "description": "Enable support for improved side-by-side handling",
+          "type": "boolean",
+          "default": false
         }
       }
     }

src/AppInstallerCLICore/Argument.cpp

@@ -30,7 +30,7 @@ namespace AppInstaller::CLI
         case Execution::Args::Type::Query:
             return { type, "query"_liv, 'q', ArgTypeCategory::PackageQuery | ArgTypeCategory::SinglePackageQuery };
         case Execution::Args::Type::MultiQuery:
-            return { type, "query"_liv, 'q', ArgTypeCategory::PackageQuery };
+            return { type, "query"_liv, 'q', ArgTypeCategory::PackageQuery | ArgTypeCategory::MultiplePackages };
         case Execution::Args::Type::Manifest:
             return { type, "manifest"_liv, 'm', ArgTypeCategory::Manifest };
 
@@ -101,6 +101,10 @@ namespace AppInstaller::CLI
             return { type, "preserve"_liv, ArgTypeCategory::None, ArgTypeExclusiveSet::PurgePreserve };
         case Execution::Args::Type::ProductCode:
             return { type, "product-code"_liv, ArgTypeCategory::SinglePackageQuery };
+        case Execution::Args::Type::AllVersions:
+            return { type, "all-versions"_liv, "all"_liv, ArgTypeCategory::CopyFlagToSubContext, ArgTypeExclusiveSet::AllAndTargetVersion };
+        case Execution::Args::Type::TargetVersion:
+            return { type, "version"_liv, 'v', ArgTypeCategory::SinglePackageQuery, ArgTypeExclusiveSet::AllAndTargetVersion };
 
         //Source Command
         case Execution::Args::Type::SourceName:
@@ -388,6 +392,10 @@ namespace AppInstaller::CLI
             return Argument{ type, Resource::String::AllowRebootArgumentDescription, ArgumentType::Flag };
         case Args::Type::IgnoreResumeLimit:
             return Argument{ type, Resource::String::IgnoreResumeLimitArgumentDescription, ArgumentType::Flag, ExperimentalFeature::Feature::Resume };
+        case Args::Type::AllVersions:
+            return Argument{ type, Resource::String::UninstallAllVersionsArgumentDescription, ArgumentType::Flag, Argument::Visibility::Help, ExperimentalFeature::Feature::SideBySide };
+        case Args::Type::TargetVersion:
+            return Argument{ type, Resource::String::TargetVersionArgumentDescription, ArgumentType::Standard };
         case Args::Type::Proxy:
             return Argument{ type, Resource::String::ProxyArgumentDescription, ArgumentType::Standard, ExperimentalFeature::Feature::Proxy, TogglePolicy::Policy::ProxyCommandLineOptions, BoolAdminSetting::ProxyCommandLineOptions };
         case Args::Type::NoProxy:

src/AppInstallerCLICore/Argument.h

@@ -86,6 +86,7 @@ namespace AppInstaller::CLI
         PinType = 0x8,
         StubType = 0x10,
         Proxy = 0x20,
+        AllAndTargetVersion = 0x40,
 
         // This must always be at the end
         Max

src/AppInstallerCLICore/Commands/RepairCommand.cpp

@@ -20,7 +20,7 @@ namespace AppInstaller::CLI
             Argument::ForType(Args::Type::Name),                             // -n
             Argument::ForType(Args::Type::Channel),
             Argument::ForType(Args::Type::Moniker),                          // -mn
-            Argument::ForType(Args::Type::Version),                          // -v
+            Argument::ForType(Args::Type::TargetVersion),                    // -v
             Argument::ForType(Args::Type::ProductCode),
             Argument::ForType(Args::Type::InstallArchitecture),              // -arch
             Argument{ Execution::Args::Type::InstallScope, Resource::String::InstalledScopeArgumentDescription, ArgumentType::Standard, Argument::Visibility::Help },
@@ -60,12 +60,16 @@ namespace AppInstaller::CLI
             return;
         }
 
+        context <<
+            Workflow::OpenSource() <<
+            Workflow::OpenCompositeSource(Repository::PredefinedSource::Installed);
+
         switch (valueType)
         {
         case Execution::Args::Type::Id:
         case Execution::Args::Type::Name:
         case Execution::Args::Type::Moniker:
-        case Execution::Args::Type::Version:
+        case Execution::Args::Type::TargetVersion:
         case Execution::Args::Type::Channel:
         case Execution::Args::Type::Source:
             context <<

src/AppInstallerCLICore/Commands/UninstallCommand.cpp

@@ -23,11 +23,12 @@ namespace AppInstaller::CLI
             Argument::ForType(Args::Type::Name),
             Argument::ForType(Args::Type::Moniker),
             Argument::ForType(Args::Type::ProductCode),
-            Argument::ForType(Args::Type::Version),
+            Argument::ForType(Args::Type::TargetVersion),
+            Argument::ForType(Args::Type::AllVersions),
             Argument::ForType(Args::Type::Channel),
             Argument::ForType(Args::Type::Source),
             Argument::ForType(Args::Type::Exact),
-            Argument{ Execution::Args::Type::InstallScope, Resource::String::InstalledScopeArgumentDescription, ArgumentType::Standard, Argument::Visibility::Help },
+            Argument{ Args::Type::InstallScope, Resource::String::InstalledScopeArgumentDescription, ArgumentType::Standard, Argument::Visibility::Help },
             Argument::ForType(Args::Type::Interactive),
             Argument::ForType(Args::Type::Silent),
             Argument::ForType(Args::Type::Force),
@@ -75,7 +76,7 @@ namespace AppInstaller::CLI
         case Execution::Args::Type::Id:
         case Execution::Args::Type::Name:
         case Execution::Args::Type::Moniker:
-        case Execution::Args::Type::Version:
+        case Execution::Args::Type::TargetVersion:
         case Execution::Args::Type::Channel:
         case Execution::Args::Type::Source:
         case Execution::Args::Type::ProductCode:
@@ -111,7 +112,6 @@ namespace AppInstaller::CLI
             // --manifest case where new manifest is provided
             context <<
                 Workflow::GetManifestFromArg <<
-                Workflow::ReportManifestIdentity <<
                 Workflow::SearchSourceUsingManifest <<
                 Workflow::EnsureOneMatchFromSearchResult(OperationType::Uninstall) <<
                 Workflow::UninstallSinglePackage;
@@ -125,7 +125,6 @@ namespace AppInstaller::CLI
                     Workflow::SearchSourceForSingle <<
                     Workflow::HandleSearchResultFailures <<
                     Workflow::EnsureOneMatchFromSearchResult(OperationType::Uninstall) <<
-                    Workflow::ReportPackageIdentity <<
                     Workflow::UninstallSinglePackage;
             }
             else

src/AppInstallerCLICore/ExecutionArgs.h

@@ -54,6 +54,8 @@ namespace AppInstaller::CLI::Execution
             Purge, // Removes all files and directories related to a package during an uninstall. Only applies to the portable installerType.
             Preserve, // Retains any files and directories created by the portable exe.
             ProductCode, // Uninstalls using the product code as the identifier.
+            AllVersions, // Uninstall all versions of the package
+            TargetVersion, // The specific version to target
 
             //Source Command
             SourceName,

src/AppInstallerCLICore/Resources.h

@@ -574,6 +574,7 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(StateHeader);
         WINGET_DEFINE_RESOURCE_STRINGID(SystemArchitecture);
         WINGET_DEFINE_RESOURCE_STRINGID(TagArgumentDescription);
+        WINGET_DEFINE_RESOURCE_STRINGID(TargetVersionArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(ThankYou);
         WINGET_DEFINE_RESOURCE_STRINGID(ThirdPartSoftwareNotices);
         WINGET_DEFINE_RESOURCE_STRINGID(ToolDescription);
@@ -585,9 +586,11 @@ namespace AppInstaller::CLI::Resource
         WINGET_DEFINE_RESOURCE_STRINGID(Unavailable);
         WINGET_DEFINE_RESOURCE_STRINGID(UnexpectedErrorExecutingCommand);
         WINGET_DEFINE_RESOURCE_STRINGID(UninstallAbandoned);
+        WINGET_DEFINE_RESOURCE_STRINGID(UninstallAllVersionsArgumentDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(UninstallCommandLongDescription);
         WINGET_DEFINE_RESOURCE_STRINGID(UninstallCommandReportDependencies);
         WINGET_DEFINE_RESOURCE_STRINGID(UninstallCommandShortDescription);
+        WINGET_DEFINE_RESOURCE_STRINGID(UninstallFailedDueToMultipleVersions);
         WINGET_DEFINE_RESOURCE_STRINGID(UninstallFailedWithCode);
         WINGET_DEFINE_RESOURCE_STRINGID(UninstallFlowStartingPackageUninstall);
         WINGET_DEFINE_RESOURCE_STRINGID(UninstallFlowUninstallSuccess);

src/AppInstallerCLICore/Workflows/CompletionFlow.cpp

@@ -82,6 +82,25 @@ namespace AppInstaller::CLI::Workflow
         }
     }
 
+    void CompleteWithSearchResultInstalledVersions(Execution::Context& context)
+    {
+        const std::string& word = context.Get<Data::CompletionData>().Word();
+        auto stream = context.Reporter.Completion();
+
+        auto installedPackage = context.Get<Execution::Data::Package>()->GetInstalled();
+
+        if (installedPackage)
+        {
+            for (const auto& vc : installedPackage->GetVersionKeys())
+            {
+                if (word.empty() || Utility::ICUCaseInsensitiveStartsWith(vc.Version, word))
+                {
+                    OutputCompletionString(stream, vc.Version);
+                }
+            }
+        }
+    }
+
     void CompleteWithSearchResultChannels(Execution::Context& context)
     {
         const std::string& word = context.Get<Data::CompletionData>().Word();
@@ -174,6 +193,13 @@ namespace AppInstaller::CLI::Workflow
                 Workflow::EnsureOneMatchFromSearchResult(OperationType::Completion) <<
                 Workflow::CompleteWithSearchResultVersions;
             break;
+        case Execution::Args::Type::TargetVersion:
+            // Here we require that the standard search finds a single entry, and we list the installed versions.
+            context <<
+                Workflow::SearchSourceForSingle <<
+                Workflow::EnsureOneMatchFromSearchResult(OperationType::Completion) <<
+                Workflow::CompleteWithSearchResultInstalledVersions;
+            break;
         case Execution::Args::Type::Channel:
             // Here we require that the standard search finds a single entry, and we list those channels.
             context <<

src/AppInstallerCLICore/Workflows/PinFlow.cpp

@@ -31,6 +31,26 @@ namespace AppInstaller::CLI::Workflow
             }
         }
 
+        void GetPinKeysForInstalled(const std::shared_ptr<IPackageVersion>& installedVersion, std::set<Pinning::PinKey>& pinKeys)
+        {
+            auto installedType = Manifest::ConvertToInstallerTypeEnum(installedVersion->GetMetadata()[PackageVersionMetadata::InstalledType]);
+            std::vector<Utility::LocIndString> propertyStrings;
+
+            if (Manifest::DoesInstallerTypeUsePackageFamilyName(installedType))
+            {
+                propertyStrings = installedVersion->GetMultiProperty(PackageVersionMultiProperty::PackageFamilyName);
+            }
+            else if (Manifest::DoesInstallerTypeUseProductCode(installedType))
+            {
+                propertyStrings = installedVersion->GetMultiProperty(PackageVersionMultiProperty::ProductCode);
+            }
+
+            for (const auto& value : propertyStrings)
+            {
+                pinKeys.emplace(Pinning::PinKey::GetPinKeyForInstalled(value));
+            }
+        }
+
         std::set<Pinning::PinKey> GetPinKeysForPackage(Execution::Context& context)
         {
             auto package = context.Get<Execution::Data::Package>();
@@ -42,7 +62,7 @@ namespace AppInstaller::CLI::Workflow
                 auto installedVersion = GetInstalledVersion(package);
                 if (installedVersion)
                 {
-                    pinKeys.emplace(Pinning::PinKey::GetPinKeyForInstalled(installedVersion->GetProperty(PackageVersionProperty::Id)));
+                    GetPinKeysForInstalled(installedVersion, pinKeys);
                 }
             }
             else

src/AppInstallerCLICore/Workflows/RepairFlow.cpp

@@ -441,7 +441,7 @@ namespace AppInstaller::CLI::Workflow
             AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_NO_APPLICABLE_INSTALLER);
         }
 
-        std::string_view requestedVersion = context.Args.Contains(Execution::Args::Type::Version) ? context.Args.GetArg(Execution::Args::Type::Version) : installedVersion.ToString();
+        std::string_view requestedVersion = context.Args.Contains(Execution::Args::Type::TargetVersion) ? context.Args.GetArg(Execution::Args::Type::TargetVersion) : installedVersion.ToString();
         // If it's Store source with only one version unknown, use the unknown version for available version mapping.
         const auto& package = context.Get<Execution::Data::Package>();
         auto packageVersions = GetAvailableVersionsForInstalledVersion(package, installedPackage);

src/AppInstallerCLICore/Workflows/UninstallFlow.cpp

@@ -69,9 +69,82 @@ namespace AppInstaller::CLI::Workflow
     }
 
     void UninstallSinglePackage(Execution::Context& context)
+    {
+        std::shared_ptr<ICompositePackage> package = context.Get<Execution::Data::Package>();
+        std::shared_ptr<IPackage> installed = package->GetInstalled();
+        std::vector<Repository::PackageVersionKey> installedVersionKeys;
+        if (installed)
+        {
+            installedVersionKeys = installed->GetVersionKeys();
+        }
+
+        // Handle multiple installed versions when we have been told to uninstall all of them.
+        if (installedVersionKeys.size() > 1 && context.Args.Contains(Execution::Args::Type::AllVersions))
+        {
+            bool allSucceeded = true;
+            size_t versionsCount = installedVersionKeys.size();
+            size_t versionsProgress = 0;
+
+            for (const auto& key : installedVersionKeys)
+            {
+                context.Reporter.Info() << '(' << ++versionsProgress << '/' << versionsCount << ") "_liv;
+
+                // We want to do best effort to uninstall all versions regardless of previous failures
+                auto subContextPtr = context.CreateSubContext();
+                Execution::Context& uninstallContext = *subContextPtr;
+                auto previousThreadGlobals = uninstallContext.SetForCurrentThread();
+
+                uninstallContext.Add<Execution::Data::Package>(package);
+                uninstallContext.Add<Execution::Data::InstalledPackageVersion>(installed->GetVersion(key));
+
+                // Prevent individual exceptions from breaking out of the loop
+                try
+                {
+                    uninstallContext <<
+                        Workflow::UninstallSinglePackageVersion;
+                }
+                catch (...)
+                {
+                    uninstallContext.SetTerminationHR(Workflow::HandleException(uninstallContext, std::current_exception()));
+                }
+
+                uninstallContext.Reporter.Info() << std::endl;
+
+                if (uninstallContext.IsTerminated())
+                {
+                    if (context.IsTerminated() && context.GetTerminationHR() == E_ABORT)
+                    {
+                        // This means that the subcontext being terminated is due to an overall abort
+                        context.Reporter.Info() << Resource::String::Cancelled << std::endl;
+                        return;
+                    }
+
+                    allSucceeded = false;
+                }
+            }
+
+            if (!allSucceeded)
+            {
+                AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_MULTIPLE_UNINSTALL_FAILED);
+            }
+        }
+        else if (installedVersionKeys.size() > 1 && !context.Args.Contains(Execution::Args::Type::TargetVersion))
+        {
+            context.Reporter.Error() << Resource::String::UninstallFailedDueToMultipleVersions << std::endl;
+            AICLI_TERMINATE_CONTEXT(APPINSTALLER_CLI_ERROR_MULTIPLE_APPLICATIONS_FOUND);
+        }
+        else
+        {
+            context <<
+                Workflow::GetInstalledPackageVersion <<
+                Workflow::UninstallSinglePackageVersion;
+        }
+    }
+
+    void UninstallSinglePackageVersion(Execution::Context& context)
     {
         context <<
-            Workflow::GetInstalledPackageVersion <<
+            Workflow::ReportInstalledPackageVersionIdentity <<
             Workflow::EnsureSupportForUninstall <<
             Workflow::GetUninstallInfo <<
             Workflow::GetDependenciesInfoForUninstall <<

src/AppInstallerCLICore/Workflows/UninstallFlow.h

@@ -12,6 +12,13 @@ namespace AppInstaller::CLI::Workflow
     // Outputs: None
     void UninstallSinglePackage(Execution::Context& context);
 
+    // Uninstalls a single package version. This also does the reporting, user interaction, and recording
+    // for single-package uninstallation.
+    // RequiredArgs: None
+    // Inputs: InstalledPackageVersion
+    // Outputs: None
+    void UninstallSinglePackageVersion(Execution::Context& context);
+
     // Uninstalls multiple packages.
     // RequiredArgs: None
     // Inputs: PackageSubContexts

src/AppInstallerCLICore/Workflows/UpdateFlow.cpp

@@ -87,6 +87,7 @@ namespace AppInstaller::CLI::Workflow
                 // The only way to enter this portion of the statement with isUpgrade is if the version is available
                 if (isUpgrade)
                 {
+                    AICLI_LOG(CLI, Verbose, << "Updating from [" << installedVersion.ToString() << "] to [" << key.Version << "]");
                     upgradeVersionAvailable = true;
                 }