Support for 1.2 Schema Additions

src/AppInstallerCLIPackage/Shared/Strings/en-us/winget.resw

@@ -1279,7 +1279,7 @@ Please specify one of them using the `--source` option to proceed.</value>
     <value>Retains all files and directories created by the package (portable)</value>
   </data>
   <data name="PurgeArgumentDescription" xml:space="preserve">
-    <value>Deletes all files and directories created by the package (portable)</value>
+    <value>Deletes all files and directories in the package directory (portable)</value>
   </data>
   <data name="RenameArgumentDescription" xml:space="preserve">
     <value>The value to rename the executable file (portable)</value>

src/AppInstallerCLITests/UserSettings.cpp

@@ -413,3 +413,16 @@ TEST_CASE("SettingsExperimentalCmd", "[settings]")
         REQUIRE(userSettingTest.GetWarnings().size() == 0);
     }
 }
+
+TEST_CASE("SettingsPortableAppRoot", "[settings]")
+{
+    SECTION("Relative path")
+    {
+        std::string_view json = R"({ "installBehavior": { "portableAppUserRoot": %LOCALAPPDATA%/Portable/Root } })";
+        SetSetting(Stream::PrimaryUserSettings, json);
+        UserSettingsTest userSettingTest;
+
+        REQUIRE(userSettingTest.Get<Setting::PortableAppUserRoot>().empty());
+        REQUIRE(userSettingTest.GetWarnings().size() == 1);
+    }
+}

src/AppInstallerCommonCore/Public/winget/UserSettings.h

@@ -137,8 +137,8 @@ namespace AppInstaller::Settings
         SETTINGMAPPING_SPECIALIZATION(Setting::InstallLocalePreference, std::vector<std::string>, std::vector<std::string>, {}, ".installBehavior.preferences.locale"sv);
         SETTINGMAPPING_SPECIALIZATION(Setting::InstallLocaleRequirement, std::vector<std::string>, std::vector<std::string>, {}, ".installBehavior.requirements.locale"sv);
         SETTINGMAPPING_SPECIALIZATION(Setting::InstallIgnoreWarnings, bool, bool, false, ".installBehavior.ignoreWarnings"sv);
-        SETTINGMAPPING_SPECIALIZATION(Setting::PortableAppUserRoot, std::string, std::string, {}, ".installBehavior.portableAppUserRoot"sv);
-        SETTINGMAPPING_SPECIALIZATION(Setting::PortableAppMachineRoot, std::string, std::string, {}, ".installBehavior.portableAppMachineRoot"sv);
+        SETTINGMAPPING_SPECIALIZATION(Setting::PortableAppUserRoot, std::string, std::filesystem::path, {}, ".installBehavior.portableAppUserRoot"sv);
+        SETTINGMAPPING_SPECIALIZATION(Setting::PortableAppMachineRoot, std::string, std::filesystem::path, {}, ".installBehavior.portableAppMachineRoot"sv);
         SETTINGMAPPING_SPECIALIZATION(Setting::UninstallPurgePortableApp, bool, bool, false, ".uninstallBehavior.purgePortableApp"sv);
         SETTINGMAPPING_SPECIALIZATION(Setting::EFDirectMSI, bool, bool, false, ".experimentalFeatures.directMSI"sv);
         SETTINGMAPPING_SPECIALIZATION(Setting::EnableSelfInitiatedMinidump, bool, bool, false, ".debugging.enableSelfInitiatedMinidump"sv);

src/AppInstallerCommonCore/UserSettings.cpp

@@ -234,8 +234,22 @@ namespace AppInstaller::Settings
         WINGET_VALIDATE_PASS_THROUGH(EnableSelfInitiatedMinidump)
         WINGET_VALIDATE_PASS_THROUGH(InstallIgnoreWarnings)
         WINGET_VALIDATE_PASS_THROUGH(UninstallPurgePortableApp)
-        WINGET_VALIDATE_PASS_THROUGH(PortableAppUserRoot)
-        WINGET_VALIDATE_PASS_THROUGH(PortableAppMachineRoot)
+
+        WINGET_VALIDATE_SIGNATURE(PortableAppUserRoot)
+        {
+            std::filesystem::path root = { value };
+            if (!root.is_absolute())
+            {
+                return {};
+            }
+
+            return root;
+        }
+
+        WINGET_VALIDATE_SIGNATURE(PortableAppMachineRoot)
+        {
+            return SettingMapping<Setting::PortableAppUserRoot>::Validate(value);
+        }
 
         WINGET_VALIDATE_SIGNATURE(InstallArchitecturePreference)
         {

src/AppInstallerRepositoryCore/Rest/Schema/1_1/Json/ManifestDeserializer_1_1.cpp

@@ -139,7 +139,7 @@ namespace AppInstaller::Repository::Rest::Schema::V1_1::Json
                     // Only add when it is valid
                     if (installerReturnCode != 0 && returnResponse != ExpectedReturnCodeEnum::Unknown)
                     {
-                        if (!installer.ExpectedReturnCodes.insert({ installerReturnCode, {returnResponse, ""} }).second)
+                        if (!installer.ExpectedReturnCodes.insert({ installerReturnCode, { returnResponse, "" } }).second)
                         {
                             AICLI_LOG(Repo, Error, << "Expected return codes cannot have repeated value.");
                             return {};