Merge branch 'master' into sorting-reviews

grokys · web-flow · commit 35fdd066e714 · 2018-08-07T09:29:36.000+02:00
diff --git a/src/GitHub.App/ViewModels/Dialog/LoginToGitHubForEnterpriseViewModel.cs b/src/GitHub.App/ViewModels/Dialog/LoginToGitHubForEnterpriseViewModel.cs
@@ -65,7 +65,7 @@ public LoginToGitHubForEnterpriseViewModel(
             this.WhenAnyValue(x => x.EnterpriseUrl, x => x.EnterpriseUrlValidator.ValidationResult)
                 .Throttle(TimeSpan.FromMilliseconds(500), scheduler)
                 .ObserveOn(RxApp.MainThreadScheduler)
-                .Subscribe(x => EnterpriseUrlChanged(x.Item1, x.Item2?.IsValid ?? false));
+                .Subscribe(x => UpdatingProbeStatus = EnterpriseUrlChanged(x.Item1, x.Item2?.IsValid ?? false));
 
             NavigateLearnMore = ReactiveCommand.CreateAsyncObservable(_ =>
             {
@@ -122,13 +122,19 @@ public IReactiveCommand<Unit> NavigateLearnMore
             get;
         }
 
+        public Task UpdatingProbeStatus
+        {
+            get;
+            private set;
+        }
+
         protected override async Task ResetValidation()
         {
             EnterpriseUrl = null;
             await EnterpriseUrlValidator.ResetAsync();
         }
 
-        async void EnterpriseUrlChanged(string url, bool valid)
+        async Task EnterpriseUrlChanged(string url, bool valid)
         {
             if (!valid)
             {
diff --git a/src/GitHub.UI/Helpers/LoadingResourceDictionary.cs b/src/GitHub.UI/Helpers/LoadingResourceDictionary.cs
@@ -3,14 +3,12 @@
 using System.Windows;
 using System.Reflection;
 using System.Collections.Generic;
-using GitHub.Logging;
-using Serilog;
+using System.Diagnostics;
 
 namespace GitHub
 {
     public class LoadingResourceDictionary : ResourceDictionary
     {
-        static readonly ILogger log = LogManager.ForContext<LoadingResourceDictionary>();
         static Dictionary<string, Assembly> assemblyDicts = new Dictionary<string, Assembly>();
 
         public new Uri Source
@@ -31,7 +29,7 @@ void EnsureAssemblyLoaded(Uri value)
                 var assemblyName = FindAssemblyNameFromPackUri(value);
                 if (assemblyName == null)
                 {
-                    log.Error("Couldn't find assembly name in '{Uri}'", value);
+                    Trace.WriteLine($"Couldn't find assembly name in '{value}'");
                     return;
                 }
 
@@ -44,16 +42,16 @@ void EnsureAssemblyLoaded(Uri value)
 
                 if (!File.Exists(assemblyFile))
                 {
-                    log.Error("Couldn't find assembly at '{AssemblyFile}'", assemblyFile);
+                    Trace.WriteLine($"Couldn't find assembly at '{assemblyFile}'");
                     return;
                 }
 
                 var assembly = Assembly.LoadFrom(assemblyFile);
                 assemblyDicts.Add(assemblyFile, assembly);
             }
-            catch(Exception e)
+            catch (Exception)
             {
-                log.Error(e, "Error loading assembly for '{Uri}'", value);
+                Trace.WriteLine($"Error loading assembly for '{value}");
             }
         }
 
diff --git a/src/GitHub.UI/Helpers/SharedDictionaryManager.cs b/src/GitHub.UI/Helpers/SharedDictionaryManager.cs
@@ -1,7 +1,6 @@
 ﻿using System;
 using System.Windows;
 using System.Collections.Generic;
-using GitHub.Extensions;
 using System.Globalization;
 
 namespace GitHub.UI.Helpers
@@ -17,8 +16,6 @@ public SharedDictionaryManager() : this(CachingFactory.GetInstanceForDomain())
 
         public SharedDictionaryManager(CachingFactory factory)
         {
-            Guard.ArgumentNotNull(factory, nameof(factory));
-
             this.factory = factory;
         }
 
@@ -77,9 +74,6 @@ public static CachingFactory GetInstanceForDomain()
 
             public ResourceDictionary GetOrCreateResourceDictionary(ResourceDictionary owner, Uri uri)
             {
-                Guard.ArgumentNotNull(owner, nameof(owner));
-                Guard.ArgumentNotNull(uri, nameof(uri));
-
                 TryAddDisposable(owner);
 
                 ResourceDictionary rd;
@@ -95,8 +89,6 @@ public ResourceDictionary GetOrCreateResourceDictionary(ResourceDictionary owner
             // Remember subtypes that need disposing of.
             public void TryAddDisposable(object owner)
             {
-                Guard.ArgumentNotNull(owner, nameof(owner));
-
                 var disposable = owner as IDisposable;
                 if (disposable != null)
                 {
@@ -132,8 +124,6 @@ public void Dispose()
 
         public static Uri FixDesignTimeUri(Uri inUri)
         {
-            Guard.ArgumentNotNull(inUri, nameof(inUri));
-
             if (inUri.Scheme != "file")
             {
                 return inUri;
diff --git a/test/GitHub.App.UnitTests/ViewModels/Dialog/LoginToGitHubForEnterpriseViewModelTests.cs b/test/GitHub.App.UnitTests/ViewModels/Dialog/LoginToGitHubForEnterpriseViewModelTests.cs
@@ -25,7 +25,7 @@ public void InvalidUrlReturnsNone()
         }
 
         [Test]
-        public void ReturnsCheckingWhenProbeNotFinished()
+        public async Task ReturnsCheckingWhenProbeNotFinished()
         {
             var scheduler = new TestScheduler();
             var caps = Substitute.For<IEnterpriseCapabilitiesService>();
@@ -37,11 +37,17 @@ public void ReturnsCheckingWhenProbeNotFinished()
             scheduler.AdvanceBy(TimeSpan.FromMilliseconds(500).Ticks);
 
             Assert.That(EnterpriseProbeStatus.Checking, Is.EqualTo(target.ProbeStatus));
-            task.SetCanceled();
+
+            try
+            {
+                task.SetCanceled();
+                await task.Task;
+            }
+            catch (TaskCanceledException) { }
         }
 
         [Test]
-        public void ReturnsValidWhenProbeReturnsOk()
+        public async Task ReturnsValidWhenProbeReturnsOk()
         {
             var scheduler = new TestScheduler();
             var caps = CreateCapabilties(EnterpriseProbeResult.Ok);
@@ -50,12 +56,13 @@ public void ReturnsValidWhenProbeReturnsOk()
             target.EnterpriseUrl = "https://foo.bar";
             scheduler.AdvanceBy(TimeSpan.FromMilliseconds(500).Ticks);
             scheduler.Stop();
+            await target.UpdatingProbeStatus;
 
             Assert.That(EnterpriseProbeStatus.Valid, Is.EqualTo(target.ProbeStatus));
         }
 
         [Test]
-        public void ReturnsInvalidWhenProbeReturnsFailed()
+        public async Task ReturnsInvalidWhenProbeReturnsFailed()
         {
             var scheduler = new TestScheduler();
             var caps = CreateCapabilties(EnterpriseProbeResult.Failed);
@@ -64,12 +71,13 @@ public void ReturnsInvalidWhenProbeReturnsFailed()
             target.EnterpriseUrl = "https://foo.bar";
             scheduler.AdvanceBy(TimeSpan.FromMilliseconds(500).Ticks);
             scheduler.Stop();
+            await target.UpdatingProbeStatus;
 
             Assert.That(EnterpriseProbeStatus.Invalid, Is.EqualTo(target.ProbeStatus));
         }
 
         [Test]
-        public void ReturnsInvalidWhenProbeReturnsNotFound()
+        public async Task ReturnsInvalidWhenProbeReturnsNotFound()
         {
             var scheduler = new TestScheduler();
             var caps = CreateCapabilties(EnterpriseProbeResult.NotFound);
@@ -78,6 +86,7 @@ public void ReturnsInvalidWhenProbeReturnsNotFound()
             target.EnterpriseUrl = "https://foo.bar";
             scheduler.AdvanceBy(TimeSpan.FromMilliseconds(500).Ticks);
             scheduler.Stop();
+            await target.UpdatingProbeStatus;
 
             Assert.That(EnterpriseProbeStatus.Invalid, Is.EqualTo(target.ProbeStatus));
         }
@@ -126,7 +135,7 @@ public void ReturnsUsernameAndPassword()
         public void GivesPrecedenceToUsernameAndPasswordOverToken()
         {
             var scheduler = new TestScheduler();
-            var caps = CreateCapabilties(EnterpriseLoginMethods.Token | 
+            var caps = CreateCapabilties(EnterpriseLoginMethods.Token |
                 EnterpriseLoginMethods.UsernameAndPassword |
                 EnterpriseLoginMethods.OAuth);
             var target = CreateTarget(scheduler, caps);

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public LoginToGitHubForEnterpriseViewModel(`
`65`	`65`	`this.WhenAnyValue(x => x.EnterpriseUrl, x => x.EnterpriseUrlValidator.ValidationResult)`
`66`	`66`	`.Throttle(TimeSpan.FromMilliseconds(500), scheduler)`
`67`	`67`	`.ObserveOn(RxApp.MainThreadScheduler)`
`68`		`- .Subscribe(x => EnterpriseUrlChanged(x.Item1, x.Item2?.IsValid ?? false));`
	`68`	`+ .Subscribe(x => UpdatingProbeStatus = EnterpriseUrlChanged(x.Item1, x.Item2?.IsValid ?? false));`
`69`	`69`
`70`	`70`	`NavigateLearnMore = ReactiveCommand.CreateAsyncObservable(_ =>`
`71`	`71`	`{`
`@@ -122,13 +122,19 @@ public IReactiveCommand<Unit> NavigateLearnMore`
`122`	`122`	`get;`
`123`	`123`	`}`
`124`	`124`
	`125`	`+ public Task UpdatingProbeStatus`
	`126`	`+ {`
	`127`	`+ get;`
	`128`	`+ private set;`
	`129`	`+ }`
	`130`	`+`
`125`	`131`	`protected override async Task ResetValidation()`
`126`	`132`	`{`
`127`	`133`	`EnterpriseUrl = null;`
`128`	`134`	`await EnterpriseUrlValidator.ResetAsync();`
`129`	`135`	`}`
`130`	`136`
`131`		`- async void EnterpriseUrlChanged(string url, bool valid)`
	`137`	`+ async Task EnterpriseUrlChanged(string url, bool valid)`
`132`	`138`	`{`
`133`	`139`	`if (!valid)`
`134`	`140`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,14 +3,12 @@`
`3`	`3`	`using System.Windows;`
`4`	`4`	`using System.Reflection;`
`5`	`5`	`using System.Collections.Generic;`
`6`		`-using GitHub.Logging;`
`7`		`-using Serilog;`
	`6`	`+using System.Diagnostics;`
`8`	`7`
`9`	`8`	`namespace GitHub`
`10`	`9`	`{`
`11`	`10`	`public class LoadingResourceDictionary : ResourceDictionary`
`12`	`11`	`{`
`13`		`- static readonly ILogger log = LogManager.ForContext<LoadingResourceDictionary>();`
`14`	`12`	`static Dictionary<string, Assembly> assemblyDicts = new Dictionary<string, Assembly>();`
`15`	`13`
`16`	`14`	`public new Uri Source`
`@@ -31,7 +29,7 @@ void EnsureAssemblyLoaded(Uri value)`
`31`	`29`	`var assemblyName = FindAssemblyNameFromPackUri(value);`
`32`	`30`	`if (assemblyName == null)`
`33`	`31`	`{`
`34`		`- log.Error("Couldn't find assembly name in '{Uri}'", value);`
	`32`	`+ Trace.WriteLine($"Couldn't find assembly name in '{value}'");`
`35`	`33`	`return;`
`36`	`34`	`}`
`37`	`35`
`@@ -44,16 +42,16 @@ void EnsureAssemblyLoaded(Uri value)`
`44`	`42`
`45`	`43`	`if (!File.Exists(assemblyFile))`
`46`	`44`	`{`
`47`		`- log.Error("Couldn't find assembly at '{AssemblyFile}'", assemblyFile);`
	`45`	`+ Trace.WriteLine($"Couldn't find assembly at '{assemblyFile}'");`
`48`	`46`	`return;`
`49`	`47`	`}`
`50`	`48`
`51`	`49`	`var assembly = Assembly.LoadFrom(assemblyFile);`
`52`	`50`	`assemblyDicts.Add(assemblyFile, assembly);`
`53`	`51`	`}`
`54`		`- catch(Exception e)`
	`52`	`+ catch (Exception)`
`55`	`53`	`{`
`56`		`- log.Error(e, "Error loading assembly for '{Uri}'", value);`
	`54`	`+ Trace.WriteLine($"Error loading assembly for '{value}");`
`57`	`55`	`}`
`58`	`56`	`}`
`59`	`57`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Windows;`
`3`	`3`	`using System.Collections.Generic;`
`4`		`-using GitHub.Extensions;`
`5`	`4`	`using System.Globalization;`
`6`	`5`
`7`	`6`	`namespace GitHub.UI.Helpers`
`@@ -17,8 +16,6 @@ public SharedDictionaryManager() : this(CachingFactory.GetInstanceForDomain())`
`17`	`16`
`18`	`17`	`public SharedDictionaryManager(CachingFactory factory)`
`19`	`18`	`{`
`20`		`- Guard.ArgumentNotNull(factory, nameof(factory));`
`21`		`-`
`22`	`19`	`this.factory = factory;`
`23`	`20`	`}`
`24`	`21`
`@@ -77,9 +74,6 @@ public static CachingFactory GetInstanceForDomain()`
`77`	`74`
`78`	`75`	`public ResourceDictionary GetOrCreateResourceDictionary(ResourceDictionary owner, Uri uri)`
`79`	`76`	`{`
`80`		`- Guard.ArgumentNotNull(owner, nameof(owner));`
`81`		`- Guard.ArgumentNotNull(uri, nameof(uri));`
`82`		`-`
`83`	`77`	`TryAddDisposable(owner);`
`84`	`78`
`85`	`79`	`ResourceDictionary rd;`
`@@ -95,8 +89,6 @@ public ResourceDictionary GetOrCreateResourceDictionary(ResourceDictionary owner`
`95`	`89`	`// Remember subtypes that need disposing of.`
`96`	`90`	`public void TryAddDisposable(object owner)`
`97`	`91`	`{`
`98`		`- Guard.ArgumentNotNull(owner, nameof(owner));`
`99`		`-`
`100`	`92`	`var disposable = owner as IDisposable;`
`101`	`93`	`if (disposable != null)`
`102`	`94`	`{`
`@@ -132,8 +124,6 @@ public void Dispose()`
`132`	`124`
`133`	`125`	`public static Uri FixDesignTimeUri(Uri inUri)`
`134`	`126`	`{`
`135`		`- Guard.ArgumentNotNull(inUri, nameof(inUri));`
`136`		`-`
`137`	`127`	`if (inUri.Scheme != "file")`
`138`	`128`	`{`
`139`	`129`	`return inUri;`