Merge remote-tracking branch 'origin/feature/metrics' into feature/metrics

Steven Kirk · Steven Kirk · commit 329e43098e85 · 2016-06-23T13:54:47.000+02:00
Conflicts:
	src/GitHub.App/Services/UsageTracker.cs
diff --git a/src/GitHub.VisualStudio/Services/UIProvider.cs b/src/GitHub.VisualStudio/Services/UIProvider.cs
@@ -142,6 +142,7 @@ public T GetService<T>()
             return (T)GetService(typeof(T));
         }
 
+        [return: AllowNull]
         public T TryGetService<T>() where T : class
         {
             return TryGetService(typeof(T)) as T;

Original file line number	Diff line number	Diff line change
`@@ -142,6 +142,7 @@ public T GetService<T>()`
`142`	`142`	`return (T)GetService(typeof(T));`
`143`	`143`	`}`
`144`	`144`
	`145`	`+ [return: AllowNull]`
`145`	`146`	`public T TryGetService<T>() where T : class`
`146`	`147`	`{`
`147`	`148`	`return TryGetService(typeof(T)) as T;`