From 3d10041521f7e3fe6c15d49324043b0886d647da Mon Sep 17 00:00:00 2001
From: David Boike <david.boike@gmail.com>
Date: Wed, 25 Oct 2023 14:10:16 -0500
Subject: [PATCH] Fix resource loading issue with assembly rename

---
 src/ServiceControl.Config/Styles/CleanWindow.xaml | 2 +-
 src/ServiceControl.Config/Styles/Icons.xaml       | 2 +-
 src/ServiceControl.Config/Themes/Generic.xaml     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/ServiceControl.Config/Styles/CleanWindow.xaml b/src/ServiceControl.Config/Styles/CleanWindow.xaml
index e60d12e666..271b227a8b 100644
--- a/src/ServiceControl.Config/Styles/CleanWindow.xaml
+++ b/src/ServiceControl.Config/Styles/CleanWindow.xaml
@@ -4,7 +4,7 @@
                     xmlns:controls="clr-namespace:ServiceControl.Config.Xaml.Controls">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/ServiceControlConfig;component/Styles/Icons.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Styles/Icons.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <Storyboard x:Key="WindowButtonMouseOverStoryboard">
diff --git a/src/ServiceControl.Config/Styles/Icons.xaml b/src/ServiceControl.Config/Styles/Icons.xaml
index 54d56c54cc..952b3848e1 100644
--- a/src/ServiceControl.Config/Styles/Icons.xaml
+++ b/src/ServiceControl.Config/Styles/Icons.xaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/ServiceControlConfig;component/Styles/Palette.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Styles/Palette.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <ControlTemplate x:Key="MinimizeIcon">
diff --git a/src/ServiceControl.Config/Themes/Generic.xaml b/src/ServiceControl.Config/Themes/Generic.xaml
index 5509f76df9..eed8a582b9 100644
--- a/src/ServiceControl.Config/Themes/Generic.xaml
+++ b/src/ServiceControl.Config/Themes/Generic.xaml
@@ -2,10 +2,10 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:ServiceControl.Config.Xaml.Controls">
     <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/ServiceControlConfig;component/Styles/Palette.xaml" />
-        <ResourceDictionary Source="/ServiceControlConfig;component/Styles/Icons.xaml" />
-        <ResourceDictionary Source="/ServiceControlConfig;component/Styles/Converters.xaml" />
-        <ResourceDictionary Source="/ServiceControlConfig;component/Styles/CleanWindow.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Styles/Palette.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Styles/Icons.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Styles/Converters.xaml" />
+        <ResourceDictionary Source="pack://application:,,,/Styles/CleanWindow.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
     <!--  ==================== FormTextBox ====================  -->