From e3fd651a516a02407f365ea7fd9ed53e98c010a3 Mon Sep 17 00:00:00 2001 From: Peter Rekdal Sunde Date: Thu, 1 Oct 2020 19:09:17 +0200 Subject: [PATCH] Revert "Support resolving application if rid name is encoded into the application id." This reverts commit 217a85ab976948986b94e47adcffcdfb774fde96. --- src/Snapx/Program.cs | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/src/Snapx/Program.cs b/src/Snapx/Program.cs index 2d2baeee..6e1fe00f 100644 --- a/src/Snapx/Program.cs +++ b/src/Snapx/Program.cs @@ -450,30 +450,10 @@ static bool MaybeOverrideLockToken([NotNull] SnapApps snapApps, [NotNull] ILog l if (workingDirectory == null) throw new ArgumentNullException(nameof(workingDirectory)); var (snapApps, snapAppTargets, _, snapsAbsoluteFilename) = BuildSnapAppsesFromDirectory(filesystem, reader, nuGetPackageSources, workingDirectory); - - var snapApp = ApplicationIdAndRid() ?? ApplicationIdContainsRid(); + var snapApp = snapAppTargets.SingleOrDefault(x => string.Equals(x.Id, id, StringComparison.OrdinalIgnoreCase) + && string.Equals(x.Target.Rid, rid, StringComparison.OrdinalIgnoreCase)); return (snapApps, snapApp, snapApps == null, snapsAbsoluteFilename); - - SnapApp ApplicationIdAndRid() - { - return snapAppTargets.SingleOrDefault(x => string.Equals(x.Id, id, StringComparison.OrdinalIgnoreCase) - && string.Equals(x.Target.Rid, rid, StringComparison.OrdinalIgnoreCase)); - } - - SnapApp ApplicationIdContainsRid() - { - return snapAppTargets.SingleOrDefault(x => - { - // Application id contains the rid, e.g. demoapp-linux-x64. - if (!x.Id.Contains("-", StringComparison.OrdinalIgnoreCase)) return false; - var lastDashPosition = x.Id.IndexOf("-", StringComparison.OrdinalIgnoreCase); - if (lastDashPosition == -1) return false; - var lhsIdAndRid = $"{x.Id.Substring(0, lastDashPosition)}-{x.Target.Rid}"; - var rhsIdAndRid = $"{id}-{rid}"; - return string.Equals(lhsIdAndRid, rhsIdAndRid, StringComparison.OrdinalIgnoreCase); - }); - } } static (SnapApps snapApps, List snapAppTargets, bool error, string snapsAbsoluteFilename) BuildSnapAppsesFromDirectory(