From 870e591f99176abc53db747dece2d681de06aede Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Fri, 19 Apr 2019 16:31:43 +0300 Subject: [PATCH] Use regular assembly names for resource uris --- src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs index 73caf69325..c76aa57a02 100644 --- a/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs +++ b/src/Avalonia.Build.Tasks/XamlCompilerTaskExecutor.Helpers.cs @@ -47,7 +47,7 @@ namespace Avalonia.Build.Tasks _res = res; } - public string Uri => $"resm:{Name}?assembly={_asm.Name}"; + public string Uri => $"resm:{Name}?assembly={_asm.Name.Name}"; public string Name => _res.Name; public byte[] GetData() => _res.GetResourceData(); public string FilePath => Name; @@ -114,7 +114,7 @@ namespace Avalonia.Build.Tasks _data = data; Name = name; FilePath = Path.Combine(projectDir, name.TrimStart('/')); - Uri = $"avares://{grp._asm.Name}/{name.TrimStart('/')}"; + Uri = $"avares://{grp._asm.Name.Name}/{name.TrimStart('/')}"; } public string Uri { get; } public string Name { get; }