From eed9eb1400d56ef9ec885e91d7d4afbc0a0e7713 Mon Sep 17 00:00:00 2001
From: Yanic Lemire <lemire.yanic@gmail.com>
Date: Mon, 22 Jul 2024 22:23:36 -0400
Subject: [PATCH] Fixed the release pipeline

---
 .github/workflows/wpf-release.yml                              | 2 +-
 src/Sidekick.Common.Ui/Views/CurrentView.cs                    | 3 +--
 .../Properties/PublishProfiles/ClickOnceRelease.pubxml         | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/wpf-release.yml b/.github/workflows/wpf-release.yml
index deda62c9..9fe2cb12 100644
--- a/.github/workflows/wpf-release.yml
+++ b/.github/workflows/wpf-release.yml
@@ -68,7 +68,7 @@ jobs:
               -prerelease | select-object -first 1
 
           Push-Location "src/Sidekick.Wpf"
-          & $msBuildPath Sidekick.Wpf.csproj /target:Publish /property:PublishProfile=ClickOnceBeta /property:ApplicationVersion=$version
+          & $msBuildPath Sidekick.Wpf.csproj /target:Publish /property:PublishProfile=ClickOnceRelease /property:ApplicationVersion=$version
           Pop-Location
 
       - name: Git - Setup
diff --git a/src/Sidekick.Common.Ui/Views/CurrentView.cs b/src/Sidekick.Common.Ui/Views/CurrentView.cs
index 762f0ca0..e397fcfb 100644
--- a/src/Sidekick.Common.Ui/Views/CurrentView.cs
+++ b/src/Sidekick.Common.Ui/Views/CurrentView.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Components;
-using Sidekick.Common.Exceptions;
 
 namespace Sidekick.Common.Ui.Views;
 
@@ -23,7 +22,7 @@ public class CurrentView(
     public string Url => navigationManager.Uri;
 
     /// <inheritdoc/>
-    public string? Key => Url.Split('/', '\\').FirstOrDefault(x => !string.IsNullOrEmpty(x));
+    public string? Key => new Uri(Url).AbsolutePath.Split('/', '\\').FirstOrDefault(x => !string.IsNullOrEmpty(x));
 
     /// <inheritdoc/>
     public SidekickView? Current { get; private set; }
diff --git a/src/Sidekick.Wpf/Properties/PublishProfiles/ClickOnceRelease.pubxml b/src/Sidekick.Wpf/Properties/PublishProfiles/ClickOnceRelease.pubxml
index b3bfe35c..dca552a0 100644
--- a/src/Sidekick.Wpf/Properties/PublishProfiles/ClickOnceRelease.pubxml
+++ b/src/Sidekick.Wpf/Properties/PublishProfiles/ClickOnceRelease.pubxml
@@ -20,7 +20,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
         <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
         <Platform>Any CPU</Platform>
         <ProductName>Sidekick</ProductName>
-        <PublishDir>bin\Release\net8.0-windows\win-x64\app.publish\</PublishDir>
+        <PublishDir>bin\publish\</PublishDir>
         <PublishUrl>bin\publish\</PublishUrl>
         <PublisherName>Sidekick</PublisherName>
         <PublishProtocol>ClickOnce</PublishProtocol>