Normalize directory separators when adding packages to path (#5796)

  - Resolves #5033

Author: Trenly

doc/ReleaseNotes.md

@@ -14,5 +14,6 @@ To use the feature, try `winget source edit winget-font` to set the Explicit sta
 <!-- Nothing yet! -->
 
 ## Bug Fixes
+* Portable Packages now use the correct directory separators regardless of which convention is used in the manifest
 * `--suppress-initial-details` now works with `winget configure test`
 * `--suppress-initial-details` no longer requires `--accept-configuration-agreements`

src/AppInstallerCLICore/PortableInstaller.cpp

@@ -359,8 +359,11 @@ namespace AppInstaller::CLI::Portable
         }
     }
 
-    void PortableInstaller::AddToPathVariable(const std::filesystem::path& value)
+    void PortableInstaller::AddToPathVariable(std::filesystem::path value)
     {
+        // Ensure the preferred separator format
+        value.make_preferred();
+
         if (PathVariable(GetScope()).Append(value))
         {
             AICLI_LOG(Core, Info, << "Appending portable target directory to PATH registry: " << value);
@@ -372,15 +375,17 @@ namespace AppInstaller::CLI::Portable
         }
     }
 
-    void PortableInstaller::RemoveFromPathVariable(const std::filesystem::path& value)
+    void PortableInstaller::RemoveFromPathVariable(std::filesystem::path value)
     {
         if (std::filesystem::exists(value) && !std::filesystem::is_empty(value))
         {
             AICLI_LOG(Core, Info, << "Install directory is not empty: " << value);
         }
         else
         {
-            if (PathVariable(GetScope()).Remove(value))
+			// Attempt to remove both the original and the preferred format to ensure removal
+            // Necessary for handling old path values associated with winget-cli#5033
+            if (PathVariable(GetScope()).Remove(value) || PathVariable(GetScope()).Remove(value.make_preferred()))
             {
                 InstallDirectoryAddedToPath = false;
                 AICLI_LOG(CLI, Info, << "Removed target directory from PATH registry: " << value);

src/AppInstallerCLICore/PortableInstaller.h

@@ -113,7 +113,7 @@ namespace AppInstaller::CLI::Portable
         void CreateTargetInstallDirectory();
         void RemoveInstallDirectory();
 
-        void AddToPathVariable(const std::filesystem::path& value);
-        void RemoveFromPathVariable(const std::filesystem::path& value);
+        void AddToPathVariable(std::filesystem::path value);
+        void RemoveFromPathVariable(std::filesystem::path value);
     };
 }