From 5d8e6fb6330000fe50364154367b38372ef8d6d7 Mon Sep 17 00:00:00 2001
From: Chris Kim <chris.kim@octopus.com>
Date: Mon, 15 Dec 2025 13:13:32 +1300
Subject: [PATCH] Fix package resolutions with spaces in names

---
 .../Plumbing/Extensions/CrossPlatformExtensions.cs       | 9 +++------
 .../Calamari.Tests/Fixtures/Util/CrossPlatformFixture.cs | 2 ++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/source/Calamari.Common/Plumbing/Extensions/CrossPlatformExtensions.cs b/source/Calamari.Common/Plumbing/Extensions/CrossPlatformExtensions.cs
index 9f754387bd..273b56777e 100644
--- a/source/Calamari.Common/Plumbing/Extensions/CrossPlatformExtensions.cs
+++ b/source/Calamari.Common/Plumbing/Extensions/CrossPlatformExtensions.cs
@@ -14,19 +14,16 @@ public static string ExpandPathEnvironmentVariables(string path)
 
                 path = Regex.Replace(path, @"(?<!\\)\$([a-zA-Z0-9_]+)", "%$1%");
                 path = Environment.ExpandEnvironmentVariables(path);
-                
-                // Special case: If the path contains "%2F", which represents an encoded forward slash,
+                // Special case: If the path contains URL-encoded forward slash (%2F) or space (%20),
                 // we assume it's part of a URL-encoded filename and not an unexpanded environment variable.
                 // In this case, we return the path as is to avoid incorrectly modifying the filename.
                 // Example: "~/Octopus/Files/Data%2FFileTransferService%2FFileTransferService@S11.0.zip"
-                // Here, %2F is part of the filename and should not be treated as an environment variable.
-                if (path.Contains("%2F") || path.Contains("%2f"))
+                // Example: "~/Octopus/Files/https_dev.azure.com_Org_ADO%20Repository@O1.0.0.zip"
+                if (path.Contains("%2F") || path.Contains("%2f") || path.Contains("%20"))
                 {
                     return path;
                 }
-        
                 // Clean up any remaining unexpanded environment variables.
-                // This removes any %VAR% patterns that weren't expanded, 
                 // ensuring only valid, expanded variables remain in the path.
                 return Regex.Replace(path, @"(?<!\\)%([a-zA-Z0-9_]+)%", "");
             }
diff --git a/source/Calamari.Tests/Fixtures/Util/CrossPlatformFixture.cs b/source/Calamari.Tests/Fixtures/Util/CrossPlatformFixture.cs
index df31825c3d..4eec40cc45 100644
--- a/source/Calamari.Tests/Fixtures/Util/CrossPlatformFixture.cs
+++ b/source/Calamari.Tests/Fixtures/Util/CrossPlatformFixture.cs
@@ -46,6 +46,8 @@ public void TildePrefixReplacedWithHome()
         [TestCase("\\$MARIO_BROTHER/blah", "\\$MARIO_BROTHER/blah", Description = "Escaped dollar preserved")]
         [TestCase("$MARIO_BROTHER/blah%2fblah.zip", "LUIGI/blah%2fblah.zip", Description = "Linux-style variable ($VAR) is expanded, but URL-encoded slash (%2f) in filename is preserved")]
         [TestCase("%MARIO_BROTHER%/blah%2fblah.zip", "LUIGI/blah%2fblah.zip", Description = "Windows-style variable (%VAR%) is expanded, and URL-encoded slash (%2f) in filename is preserved")]
+        [TestCase("$MARIO_BROTHER/blah%20blah.zip", "LUIGI/blah%20blah.zip", Description = "Linux-style variable ($VAR) is expanded, but URL-encoded space (%20) in filename is preserved")]
+        [TestCase("%MARIO_BROTHER%/blah%20blah.zip", "LUIGI/blah%20blah.zip", Description = "Windows-style variable (%VAR%) is expanded, and URL-encoded space (%20) in filename is preserved")]
         [Category(TestCategory.CompatibleOS.OnlyNixOrMac)]
         public void NixEnvironmentVariableReplaced(string inputValue, string expectedResult)
         {