Skip to content
This repository
Browse code

Merge pull request #214 from jordansjones/master

Addresses issue #209.
  • Loading branch information...
commit dfcc95fa3ab3eed6898aea9d47a79a15f8d6e88f 2 parents 2e9205d + 9833374
Paul Betts paulcbetts authored
2  ReactiveUI.Routing/RoutedViewHost.cs
@@ -52,6 +52,8 @@ public RoutedViewHost()
52 52 HorizontalContentAlignment = HorizontalAlignment.Stretch;
53 53 VerticalContentAlignment = VerticalAlignment.Stretch;
54 54
  55 + if (RxApp.InUnitTestRunner()) return;
  56 +
55 57 this.WhenAny(x => x.Router.NavigationStack, x => x.Value)
56 58 .SelectMany(x => x.CollectionCountChanged.StartWith(x.Count).Select(_ => x.LastOrDefault()))
57 59 .Subscribe(vm => {
3  ReactiveUI/RxApp.cs
@@ -476,7 +476,7 @@ public static bool InUnitTestRunner(string[] testAssemblies, string[] designEnvi
476 476 // without access to any WPF references :-/
477 477 var entry = Assembly.GetEntryAssembly();
478 478 if (entry != null) {
479   - var exeName = entry.Location.ToUpperInvariant();
  479 + var exeName = (new FileInfo(entry.Location)).Name.ToUpperInvariant();
480 480
481 481 if (designEnvironments.Any(x => x.Contains(exeName))) {
482 482 return true;
@@ -510,6 +510,7 @@ public static bool InUnitTestRunner()
510 510 "BLEND.EXE",
511 511 "MONODEVELOP",
512 512 "SHARPDEVELOP.EXE",
  513 + "XDESPROC.EXE",
513 514 };
514 515
515 516 return InUnitTestRunner(testAssemblies, designEnvironments);

0 comments on commit dfcc95f

Please sign in to comment.
Something went wrong with that request. Please try again.