From d06de9c412136021da519cb95bf9fbb1691b759b Mon Sep 17 00:00:00 2001 From: Christian Liberto Date: Mon, 23 Feb 2026 10:20:39 +0100 Subject: [PATCH] Remove trimming of trailing slash to ensure new Uri(uri, "v2") does not override the subpath --- .../Integration/Packages/Download/OciPackageDownloader.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/Calamari.Shared/Integration/Packages/Download/OciPackageDownloader.cs b/source/Calamari.Shared/Integration/Packages/Download/OciPackageDownloader.cs index f72b6368f3..cfcc374b05 100644 --- a/source/Calamari.Shared/Integration/Packages/Download/OciPackageDownloader.cs +++ b/source/Calamari.Shared/Integration/Packages/Download/OciPackageDownloader.cs @@ -180,7 +180,7 @@ static void ApplyAccept(HttpRequestMessage request) static Uri GetApiUri(Uri feedUri) { var httpScheme = BuildScheme(IsPlainHttp(feedUri)); - var r = feedUri.ToString().Replace($"oci{Uri.SchemeDelimiter}", $"{httpScheme}{Uri.SchemeDelimiter}").TrimEnd('/'); + var r = feedUri.ToString().Replace($"oci{Uri.SchemeDelimiter}", $"{httpScheme}{Uri.SchemeDelimiter}"); var uri = new Uri(r); if (!r.EndsWith("/" + VersionPath)) {