Merge branch 'develop' into xml-comments-auto-persist-helper

src/ReactiveUI/CompatMixins.cs

@@ -1,29 +1,22 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Reactive.Subjects;
 
 namespace ReactiveUI
 {
-    public static class CompatMixins
+    internal static class CompatMixins
     {
         internal static void ForEach<T>(this IEnumerable<T> This, Action<T> block)
         {
             foreach (var v in This) {
-                block(v); 
+                block(v);
             }
         }
 
         internal static IEnumerable<T> SkipLast<T>(this IEnumerable<T> This, int count)
         {
             return This.Take(This.Count() - count);
         }
-
-        internal static IObservable<T> PermaRef<T>(this IConnectableObservable<T> This)
-        {
-            This.Connect();
-            return This;
-        }
     }
 
     // according to spouliot, this is just a string match, and will cause the

src/ReactiveUI/Interactions.cs

@@ -115,7 +115,7 @@ public TOutput GetOutput()
     /// <para>
     /// Note that handlers are not required to handle an interaction. They can choose to ignore it, leaving it
     /// for some other handler to handle. If no handler handles the interaction, the <see cref="Handle"/> method
-    /// will throw an <see cref="UnhandledInteractionException"/>.
+    /// will throw an <see cref="UnhandledInteractionException{TInput, TOutput}"/>.
     /// </para>
     /// </remarks>
     /// <typeparam name="TInput">
@@ -228,15 +228,15 @@ public IDisposable RegisterHandler<TDontCare>(Func<InteractionContext<TInput, TO
         /// <para>
         /// This method passes the interaction through to relevant handlers in reverse order of registration,
         /// ceasing once any handler handles the interaction. If the interaction remains unhandled after all
-        /// relevant handlers have executed, an <see cref="UnhandledInteractionException"/> is thrown.
+        /// relevant handlers have executed, an <see cref="UnhandledInteractionException{TInput, TOutput}"/> is thrown.
         /// </para>
         /// </remarks>
         /// <param name="input">
         /// The input for the interaction.
         /// </param>
         /// <returns>
         /// An observable that ticks when the interaction completes, or throws an
-        /// <see cref="UnhandledInteractionException"/> if no handler handles the interaction.
+        /// <see cref="UnhandledInteractionException{TInput, TOutput}"/> if no handler handles the interaction.
         /// </returns>
         public virtual IObservable<TOutput> Handle(TInput input)
         {

src/ReactiveUI/RegisterableInterfaces.cs

@@ -205,7 +205,7 @@ bool ExecuteHook(
     public interface IActivatable { }
 
     /// <summary>
-    /// This base class is mostly used by the Framework. Implement IViewFor<T>
+    /// This base class is mostly used by the Framework. Implement <see cref="IViewFor{T}"/>
     /// instead.
     /// </summary>
     public interface IViewFor : IActivatable
@@ -394,8 +394,9 @@ public interface ISuspensionHost : IReactiveObject
         Func<object> CreateNewAppState { get; set; }
 
         /// <summary>
-        /// The current application state - get a typed version of this via
-        /// GetAppState<T>. The "application state" is a notion entirely defined
+        /// The current application state - get a typed version of this via 
+        /// <see cref="SuspensionHostExtensions.GetAppState{T}(ISuspensionHost)"/>.
+        /// The "application state" is a notion entirely defined
         /// via the client application - the framework places no restrictions on
         /// the object other than it can be serialized.
         /// </summary>

src/ReactiveUI/ViewLocator.cs

@@ -61,7 +61,6 @@ public DefaultViewLocator(Func<string, string> viewModelToViewFunc = null)
         /// </description>
         /// </item>
         /// <item>
-        /// <item>
         /// <description>
         /// Look for a service registered under the type whose name is given to us by passing <c>T</c> to <see cref="ViewModelToViewFunc"/> (which defaults to changing "ViewModel" to "View").
         /// </description>
@@ -87,6 +86,9 @@ public DefaultViewLocator(Func<string, string> viewModelToViewFunc = null)
         /// <param name="viewModel">
         /// The view model whose associated view is to be resolved.
         /// </param>
+        /// <param name="contract">
+        /// Optional contract to be used when resolving from Splat
+        /// </param>
         /// <returns>
         /// The view associated with the given view model.
         /// </returns>