From 630be0c6bfdaa97e5910427075004aa70cb2d6b9 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Sat, 26 Dec 2015 21:07:30 +0300 Subject: [PATCH] Test app is running again --- samples/TestApplicationShared/MainWindow.cs | 2 +- src/Shared/PlatformSupport/AssetLoader.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/TestApplicationShared/MainWindow.cs b/samples/TestApplicationShared/MainWindow.cs index e702b6f4a5..4c27018c6f 100644 --- a/samples/TestApplicationShared/MainWindow.cs +++ b/samples/TestApplicationShared/MainWindow.cs @@ -358,7 +358,7 @@ namespace TestApplication static Stream GetImage(string path) { - return PerspexLocator.Current.GetService().Open(new Uri("res:///" + RootNamespace + "." + path)); + return PerspexLocator.Current.GetService().Open(new Uri("resm:" + RootNamespace + "." + path)); } private static TabItem ListsTab() diff --git a/src/Shared/PlatformSupport/AssetLoader.cs b/src/Shared/PlatformSupport/AssetLoader.cs index 48378dfe31..a954bd0022 100644 --- a/src/Shared/PlatformSupport/AssetLoader.cs +++ b/src/Shared/PlatformSupport/AssetLoader.cs @@ -87,7 +87,7 @@ namespace Perspex.Shared.PlatformSupport if (!uri.IsAbsoluteUri || uri.Scheme == "resm") { var qs = uri.Query.TrimStart('?') - .Split('&') + .Split(new[] {'&'}, StringSplitOptions.RemoveEmptyEntries) .Select(p => p.Split('=')) .ToDictionary(p => p[0], p => p[1]); //TODO: Replace _defaultAssembly by current one (need support from OmniXAML)