Fix potential paths in the whole XAML

gluck · Nov 21, 2017 · 601c050 · 601c050
1 parent db9e300
commit 601c050
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/ILRepack.IntegrationTests/Scenarios/ClassLibrary/DummyUserControl.xaml b/ILRepack.IntegrationTests/Scenarios/ClassLibrary/DummyUserControl.xaml
@@ -2,8 +2,11 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              Width="150" Height="50" Background="Red">
+    <UserControl.Resources>
+        <ImageSource x:Key="ImageSource">/ClassLibrary;component/Resources/image.png</ImageSource>
+    </UserControl.Resources>
     <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
         <TextBlock Text="Library User Control" />
-        <Image x:Name="TheImage" Source="/ClassLibrary;component/Resources/image.png" Height="10" Width="10" />
+        <Image x:Name="TheImage" Source="{StaticResource ImageSource}" Height="10" Width="10" />
     </StackPanel>
 </UserControl>
diff --git a/ILRepack/Steps/ResourceProcessing/BamlResourcePatcher.cs b/ILRepack/Steps/ResourceProcessing/BamlResourcePatcher.cs
@@ -66,6 +66,15 @@ private void ProcessRecord(PropertyWithConverterRecord record, AssemblyDefinitio
                 _otherAssemblies);
         }
 
+        private void ProcessRecord(TextWithConverterRecord record, AssemblyDefinition containingAssembly)
+        {
+            record.Value = XamlResourcePathPatcherStep.PatchPath(
+                record.Value,
+                _mainAssembly,
+                containingAssembly,
+                _otherAssemblies);
+        }
+
         private void ProcessRecord(AssemblyInfoRecord record, AssemblyDefinition containingAssembly)
         {
             var assemblyName = new System.Reflection.AssemblyName(record.AssemblyFullName);