Merge pull request #1093 from github/fixes/1092-dont-set-ResourceAssembly

Don't explicitly set Application.ResourceAssembly

Author: jcansdale

src/GitHub.App/Services/AvatarProvider.cs

@@ -1,14 +1,15 @@
 using System;
+using System.IO.Packaging;
 using System.ComponentModel.Composition;
 using System.Diagnostics;
 using System.Reactive;
 using System.Reactive.Linq;
-using System.Windows;
 using System.Windows.Media.Imaging;
 using Akavache;
 using GitHub.Caches;
 using GitHub.Extensions;
 using GitHub.Models;
+using System.Windows;
 
 namespace GitHub.Services
 {
@@ -24,13 +25,9 @@ public class AvatarProvider : IAvatarProvider
 
         static AvatarProvider()
         {
-            // NB: If this isn't explicitly set, WPF will try to guess it via
-            // GetEntryAssembly, which in a unit test runner will be null
-            // This is needed for the pack:// URL format to be understood.
-            if (Application.ResourceAssembly == null)
-            {
-                Application.ResourceAssembly = typeof(AvatarProvider).Assembly;
-            }
+            // Calling `Application.Current` will install pack URI scheme via Application.cctor.
+            // This is needed when unit testing for the pack:// URL format to be understood.
+            if (Application.Current != null) { }
         }
 
         [ImportingConstructor]
@@ -71,7 +68,7 @@ public IObservable<BitmapSource> GetAvatar(IAvatarContainer apiAccount)
             return imageCache.GetImage(avatarUrl)
                 .Catch<BitmapSource, Exception>(_ => Observable.Return(DefaultAvatar(apiAccount)));
         }
-            
+
         public IObservable<Unit> InvalidateAvatar(IAvatarContainer apiAccount)
         {
             return String.IsNullOrWhiteSpace(apiAccount?.Login)
@@ -87,7 +84,7 @@ BitmapImage DefaultAvatar(IAvatarContainer apiAccount)
         }
 
         protected virtual void Dispose(bool disposing)
-        {}
+        { }
 
         public void Dispose()
         {

test/GitHub.UI.UnitTests/Helpers/ResourceDictionaryUtilities.cs

@@ -1,18 +1,19 @@
 using System;
 using System.IO;
+using System.IO.Packaging;
 using System.Windows;
 
 namespace GitHub.UI.Helpers.UnitTests
 {
     class ResourceDictionaryUtilities
     {
+        public static string PackUriScheme { get; private set; }
+
         public static Uri ToPackUri(string url)
         {
-            if (!UriParser.IsKnownScheme("pack"))
-            {
-                // Register the pack scheme.
-                new Application();
-            }
+            // Calling `Application.Current` will install pack URI scheme via Application.cctor.
+            // This is needed when unit testing for the pack:// URL format to be understood.
+            if (Application.Current != null) { }
 
             return new Uri(url);
         }