reactiveui · RLittlesII · Mar 20, 2019 · Mar 20, 2019 · Mar 20, 2019 · Mar 20, 2019
diff --git a/src/ReactiveUI.Fody.Tests/FodyWeavers.xsd b/src/ReactiveUI.Fody.Tests/FodyWeavers.xsd
@@ -4,6 +4,7 @@
   <xs:element name="Weavers">
     <xs:complexType>
       <xs:all>
+        <xs:element name="ReactiveUI.Fody.deps" minOccurs="0" maxOccurs="1" type="xs:anyType" />
         <xs:element name="ReactiveUI" minOccurs="0" maxOccurs="1" type="xs:anyType" />
       </xs:all>
       <xs:attribute name="VerifyAssembly" type="xs:boolean">

diff --git a/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewDependencyResolverTests.cs b/src/ReactiveUI.Tests/Platforms/windows-xaml/XamlViewDependencyResolverTests.cs
@@ -26,7 +26,7 @@ namespace ReactiveUI.Tests.Xaml
     /// </summary>
     public sealed class XamlViewDependencyResolverTests : IDisposable
     {
-        private readonly IMutableDependencyResolver _resolver;
+        private readonly IDependencyResolver _resolver;
 
         public XamlViewDependencyResolverTests()
         {

diff --git a/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewDependencyResolverTests.cs b/src/ReactiveUI.Tests/Platforms/winforms/WinFormsViewDependencyResolverTests.cs
@@ -17,7 +17,7 @@ namespace ReactiveUI.Tests.Winforms
 {
     public sealed class WinFormsViewDependencyResolverTests : IDisposable
     {
-        private readonly IMutableDependencyResolver _resolver;
+        private readonly IDependencyResolver _resolver;
 
         public WinFormsViewDependencyResolverTests()
         {

diff --git a/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt b/src/ReactiveUI.Tests/Platforms/wpf/API/ApiApprovalTests.Wpf.net461.approved.txt
@@ -121,16 +121,4 @@ namespace ReactiveUI.Wpf
         public Registrations() { }
         public void Register(System.Action<System.Func<object>, System.Type> registerFunction) { }
     }
-}
-namespace XamlGeneratedNamespace
-{
-    public sealed class GeneratedInternalTypeHelper : System.Windows.Markup.InternalTypeHelper
-    {
-        public GeneratedInternalTypeHelper() { }
-        protected override void AddEventHandler(System.Reflection.EventInfo eventInfo, object target, System.Delegate handler) { }
-        protected override System.Delegate CreateDelegate(System.Type delegateType, object target, string handler) { }
-        protected override object CreateInstance(System.Type type, System.Globalization.CultureInfo culture) { }
-        protected override object GetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, System.Globalization.CultureInfo culture) { }
-        protected override void SetPropertyValue(System.Reflection.PropertyInfo propertyInfo, object target, object value, System.Globalization.CultureInfo culture) { }
-    }
 }
diff --git a/src/ReactiveUI.Tests/Platforms/wpf/WpfViewDependencyResolverTests.cs b/src/ReactiveUI.Tests/Platforms/wpf/WpfViewDependencyResolverTests.cs
@@ -17,7 +17,7 @@ namespace ReactiveUI.Tests.Wpf
 {
     public sealed class WpfViewDependencyResolverTests : IDisposable
     {
-        private readonly IMutableDependencyResolver _resolver;
+        private readonly IDependencyResolver _resolver;
 
         public WpfViewDependencyResolverTests()
         {

diff --git a/src/ReactiveUI.Tests/Resolvers/DependencyResolverTests.cs b/src/ReactiveUI.Tests/Resolvers/DependencyResolverTests.cs
@@ -13,7 +13,7 @@ namespace ReactiveUI.Tests
 {
     public sealed class DependencyResolverTests : IDisposable
     {
-        private readonly IMutableDependencyResolver _resolver;
+        private readonly IDependencyResolver _resolver;
 
         public DependencyResolverTests()
         {

diff --git a/src/ReactiveUI.Tests/Resolvers/PocoObservableForPropertyTests.cs b/src/ReactiveUI.Tests/Resolvers/PocoObservableForPropertyTests.cs
@@ -65,13 +65,23 @@ private class TestLogger : ILogger
         {
             public List<string> LastMessages { get; } = new List<string>();
 
-            public LogLevel Level { get; set; }
+            public LogLevel Level => LogLevel.Debug;
+
+            public void Write(Exception exception, string message, Type type, LogLevel logLevel)
+            {
+                LastMessages.Add(message);
+            }
 
             public void Write(string message, LogLevel logLevel)
             {
                 LastMessages.Add(message);
             }
 
+            public void Write(Exception exception, string message, LogLevel logLevel)
+            {
+                LastMessages.Add(message);
+            }
+
             public void Write([Localizable(false)] string message, [Localizable(false)] Type type, LogLevel logLevel)
             {
                 LastMessages.Add(message);

diff --git a/src/ReactiveUI.Tests/Utilities/TestLogger.cs b/src/ReactiveUI.Tests/Utilities/TestLogger.cs
@@ -25,11 +25,21 @@ public TestLogger()
 
         public LogLevel Level { get; set; }
 
+        public void Write(Exception exception, string message, Type type, LogLevel logLevel)
+        {
+            Messages.Add(Tuple.Create(message, typeof(TestLogger), logLevel));
+        }
+
         public void Write(string message, LogLevel logLevel)
         {
             Messages.Add(Tuple.Create(message, typeof(TestLogger), logLevel));
         }
 
+        public void Write(Exception exception, string message, LogLevel logLevel)
+        {
+            Messages.Add(Tuple.Create(message, typeof(TestLogger), logLevel));
+        }
+
         public void Write([Localizable(false)] string message, [Localizable(false)] Type type, LogLevel logLevel)
         {
             Messages.Add(Tuple.Create(message, type, logLevel));

diff --git a/src/ReactiveUI.Winforms/ActivationForViewFetcher.cs b/src/ReactiveUI.Winforms/ActivationForViewFetcher.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.ComponentModel;
+using System.Globalization;
 using System.Reactive.Linq;
 using System.Reflection;
 using System.Windows.Forms;
@@ -58,19 +59,17 @@ public IObservable<bool> GetActivationForView(IActivatable view)
             }
 
             // Show a friendly warning in the log that this view will never be activated
-            this.Log().Warn("Expected a view of type System.Windows.Forms.Control but it is {0}.\r\nYou need to implement your own IActivationForViewFetcher for {0}.", view.GetType());
+            this.Log().Warn(
+                            CultureInfo.InvariantCulture,
+                            "Expected a view of type System.Windows.Forms.Control but it is {0}.\r\nYou need to implement your own IActivationForViewFetcher for {0}.",
+                            view.GetType());
 
             return Observable<bool>.Empty;
         }
 
         private static bool GetIsDesignMode(Control control)
         {
-            var isDesignMode = false;
-
-            if (LicenseManager.UsageMode == LicenseUsageMode.Designtime)
-            {
-                isDesignMode = true;
-            }
+            bool isDesignMode = LicenseManager.UsageMode == LicenseUsageMode.Designtime;
 
             if (control.Site?.DesignMode == true)
             {

diff --git a/src/ReactiveUI/Bindings/Converter/EqualityTypeConverter.cs b/src/ReactiveUI/Bindings/Converter/EqualityTypeConverter.cs
@@ -117,7 +117,7 @@ public bool TryConvert(object from, Type toType, object conversionHint, out obje
             }
             catch (Exception ex)
             {
-                this.Log().WarnException("Couldn't convert object to type: " + toType, ex);
+                this.Log().Warn(ex, "Couldn't convert object to type: " + toType);
                 result = null;
                 return false;
             }

diff --git a/src/ReactiveUI/Bindings/Property/PropertyBinderImplementation.cs b/src/ReactiveUI/Bindings/Property/PropertyBinderImplementation.cs
@@ -5,6 +5,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reactive.Disposables;
@@ -488,7 +489,7 @@ object SetThenGet(object paramTarget, object paramValue, object[] paramParams)
                     .Select(x => (TValue)SetThenGet(x.host, x.val, viewExpression.GetArgumentsArray()));
             }
 
-            return (setObservable.Subscribe(_ => { }, ex => this.Log().ErrorException($"{viewExpression} Binding received an Exception!", ex)), setObservable);
+            return (setObservable.Subscribe(_ => { }, ex => this.Log().Error(ex, $"{viewExpression} Binding received an Exception!")), setObservable);
         }
 
         private bool EvalBindingHooks<TViewModel, TView>(TViewModel viewModel, TView view, Expression vmExpression, Expression viewExpression, BindingDirection direction)
@@ -526,7 +527,7 @@ private bool EvalBindingHooks<TViewModel, TView>(TViewModel viewModel, TView vie
             {
                 var vmString = $"{typeof(TViewModel).Name}.{string.Join(".", vmExpression)}";
                 var vString = $"{typeof(TView).Name}.{string.Join(".", viewExpression)}";
-                this.Log().Warn("Binding hook asked to disable binding {0} => {1}", vmString, vString);
+                this.Log().Warn(CultureInfo.InvariantCulture, "Binding hook asked to disable binding {0} => {1}", vmString, vString);
             }
 
             return shouldBind;

diff --git a/src/ReactiveUI/Legacy/ReactiveDerivedCollection.cs b/src/ReactiveUI/Legacy/ReactiveDerivedCollection.cs
@@ -8,6 +8,7 @@
 using System.Collections.Specialized;
 using System.Diagnostics;
 using System.Diagnostics.Contracts;
+using System.Globalization;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Concurrency;
@@ -111,8 +112,8 @@ private void WireUpChangeNotifications()
                     if (!hasWarned.ContainsKey(type))
                     {
                         this.Log().Warn(
-                            "{0} doesn't implement INotifyCollectionChanged, derived collection will only update " +
-                            "when the Reset() method is invoked manually or the reset observable is signalled.",
+                            CultureInfo.InvariantCulture,
+                            "{0} doesn't implement INotifyCollectionChanged, derived collection will only update when the Reset() method is invoked manually or the reset observable is signalled.",
                             type.FullName);
                         hasWarned.Add(type, true);
                     }

diff --git a/src/ReactiveUI/Legacy/ReactiveList.cs b/src/ReactiveUI/Legacy/ReactiveList.cs
@@ -9,6 +9,7 @@
 using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Reactive;
 using System.Reactive.Concurrency;
@@ -878,7 +879,7 @@ private void AddItemToPropertyTracking(T toTrack)
                 goto isSetup;
             }
 
-            this.Log().Warn("Property change notifications are enabled and type {0} isn't INotifyPropertyChanged or IReactiveObject", typeof(T));
+            this.Log().Warn(CultureInfo.InvariantCulture, "Property change notifications are enabled and type {0} isn't INotifyPropertyChanged or IReactiveObject", typeof(T));
 
             isSetup:
             var toDispose = new[]

diff --git a/src/ReactiveUI/Mixins/ObservableLoggingMixin.cs b/src/ReactiveUI/Mixins/ObservableLoggingMixin.cs
@@ -4,6 +4,7 @@
 // See the LICENSE file in the project root for full license information.
 
 using System;
+using System.Globalization;
 using System.Reactive.Linq;
 using Splat;
 
@@ -36,15 +37,15 @@ public static IObservable<T> Log<T, TObj>(
             if (stringifier != null)
             {
                 return @this.Do(
-                    x => klass.Log().Info("{0} OnNext: {1}", message, stringifier(x)),
-                    ex => klass.Log().WarnException(message + " " + "OnError", ex),
-                    () => klass.Log().Info("{0} OnCompleted", message));
+                    x => klass.Log().Info(CultureInfo.InvariantCulture, "{0} OnNext: {1}", message, stringifier(x)),
+                    ex => klass.Log().Warn(ex, message + " " + "OnError"),
+                    () => klass.Log().Info(CultureInfo.InvariantCulture, "{0} OnCompleted", message));
             }
 
             return @this.Do(
-                x => klass.Log().Info("{0} OnNext: {1}", message, x),
-                ex => klass.Log().WarnException(message + " " + "OnError", ex),
-                () => klass.Log().Info("{0} OnCompleted", message));
+                x => klass.Log().Info(CultureInfo.InvariantCulture, "{0} OnNext: {1}", message, x),
+                ex => klass.Log().Warn(ex, message + " " + "OnError"),
+                () => klass.Log().Info(CultureInfo.InvariantCulture, "{0} OnCompleted", message));
         }
 
         /// <summary>
@@ -63,7 +64,7 @@ public static IObservable<T> LoggedCatch<T, TObj>(this IObservable<T> @this, TOb
             next = next ?? Observable<T>.Default;
             return @this.Catch<T, Exception>(ex =>
             {
-                klass.Log().WarnException(message ?? string.Empty, ex);
+                klass.Log().Warn(ex, message ?? string.Empty);
                 return next;
             });
         }
@@ -86,7 +87,7 @@ public static IObservable<T> LoggedCatch<T, TObj, TException>(this IObservable<T
         {
             return @this.Catch<T, TException>(ex =>
             {
-                klass.Log().WarnException(message ?? string.Empty, ex);
+                klass.Log().Warn(ex, message ?? string.Empty);
                 return next(ex);
             });
         }

diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveControl.cs
@@ -102,14 +102,16 @@ public event PropertyChangedEventHandler PropertyChanged
         /// <summary>
         /// Gets a observable when the control is activated.
         /// </summary>
-        [SuppressMessage("Design", "CS0108: member hides inherited member", Justification = "Different type.")]
+#pragma warning disable CS0108 // member hides inherited member
         public IObservable<Unit> Activated => _activated.AsObservable();
+#pragma warning restore CS0108
 
         /// <summary>
-        /// Gets a observable that occurrs when the control is deactivated.
+        /// Gets a observable that occurs when the control is deactivated.
         /// </summary>
-        [SuppressMessage("Design", "CS0108: member hides inherited member", Justification = "Different type.")]
+#pragma warning disable CS0108 // member hides inherited member
         public IObservable<Unit> Deactivated => _deactivated.AsObservable();
+#pragma warning restore CS0108
 
 #if UIKIT
         /// <inheritdoc/>

diff --git a/src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs b/src/ReactiveUI/Platforms/apple-common/ReactiveImageView.cs
@@ -117,12 +117,14 @@ public event PropertyChangedEventHandler PropertyChanged
         public IObservable<Exception> ThrownExceptions => this.GetThrownExceptionsObservable();
 
         /// <inheritdoc/>
-        [SuppressMessage("Design", "CS0108: member hides inherited member", Justification = "Different type.")]
+#pragma warning disable CS0108 // member hides inherited member
         public IObservable<Unit> Activated => _activated.AsObservable();
+#pragma warning restore CS0108
 
         /// <inheritdoc/>
-        [SuppressMessage("Design", "CS0108: member hides inherited member", Justification = "Different type.")]
+#pragma warning disable CS0108 // member hides inherited member
         public IObservable<Unit> Deactivated => _deactivated.AsObservable();
+#pragma warning restore CS0108
 
         /// <inheritdoc />
         public IObservable<IReactivePropertyChangedEventArgs<ReactiveImageView>> Changing => this.GetChangingObservable();

diff --git a/src/ReactiveUI/Platforms/uap10.0.16299/DependencyObjectObservableForProperty.cs b/src/ReactiveUI/Platforms/uap10.0.16299/DependencyObjectObservableForProperty.cs
@@ -5,9 +5,11 @@
 
 using System;
 using System.Diagnostics.Contracts;
+using System.Globalization;
 using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Reflection;
+using System.Windows;
 using Splat;
 using Windows.UI.Xaml;
 
@@ -44,6 +46,7 @@ public IObservable<IObservedChange<object, object>> GetNotificationForProperty(o
             if (depSender == null)
             {
                 this.Log().Warn(
+                    CultureInfo.InvariantCulture,
                     "Tried to bind DP on a non-DependencyObject. Binding as POCO object",
                     type.FullName,
                     propertyName);
@@ -55,6 +58,7 @@ public IObservable<IObservedChange<object, object>> GetNotificationForProperty(o
             if (beforeChanged == true)
             {
                 this.Log().Warn(
+                    CultureInfo.InvariantCulture,
                     "Tried to bind DO {0}.{1}, but DPs can't do beforeChanged. Binding as POCO object",
                     type.FullName,
                     propertyName);
@@ -67,6 +71,7 @@ public IObservable<IObservedChange<object, object>> GetNotificationForProperty(o
             if (dpFetcher == null)
             {
                 this.Log().Warn(
+                    CultureInfo.InvariantCulture,
                     "Tried to bind DO {0}.{1}, but DP doesn't exist. Binding as POCO object",
                     type.FullName,
                     propertyName);

diff --git a/src/ReactiveUI/Platforms/uikit-common/CommonReactiveSource.cs b/src/ReactiveUI/Platforms/uikit-common/CommonReactiveSource.cs
@@ -55,14 +55,14 @@ public CommonReactiveSource(IUICollViewAdapter<TUIView, TUIViewCell> adapter)
                     skipInitial: true)
                 .Subscribe(
                     _ => SectionInfoChanging(),
-                    ex => this.Log().ErrorException("Error occurred whilst SectionInfo changing.", ex)));
+                    ex => this.Log().Error(ex, "Error occurred whilst SectionInfo changing.")));
 
             _mainDisposables.Add(
                 this
                 .WhenAnyValue(x => x.SectionInfo)
                 .Subscribe(
                     SectionInfoChanged,
-                    ex => this.Log().ErrorException("Error occurred when SectionInfo changed.", ex)));
+                    ex => this.Log().Error(ex, "Error occurred when SectionInfo changed.")));
         }
 
         public IReadOnlyList<TSectionInfo> SectionInfo
@@ -295,7 +295,7 @@ private void SubscribeToSectionInfoChanges(int sectionInfoId, IReadOnlyList<TSec
                                 // this ensures that if application code itself calls BeginUpdates/EndUpdates on the view before the changes have been applied, those inconsistencies
                                 // between what's in the data source versus what the view believes is in the data source won't trigger any errors because of the outstanding
                                 // BeginUpdates call (calls to BeginUpdates/EndUpdates can be nested)
-                                this.Log().Debug("[#{0}] BeginUpdates", sectionInfoId);
+                                this.Log().Debug(CultureInfo.InvariantCulture, "[#{0}] BeginUpdates", sectionInfoId);
                                 _adapter.BeginUpdates();
 
                                 applyPendingChangesDisposable.Disposable = RxApp.MainThreadScheduler.Schedule(
@@ -311,7 +311,7 @@ private void SubscribeToSectionInfoChanges(int sectionInfoId, IReadOnlyList<TSec
 
                             _pendingChanges.Add(Tuple.Create(y.Section, new PendingChange(y.Change.EventArgs)));
                         },
-                            ex => this.Log().Error("[#{0}] Error while watching section collection: {1}", sectionInfoId, ex)));
+                            ex => this.Log().Error(CultureInfo.InvariantCulture, "[#{0}] Error while watching section collection: {1}", sectionInfoId, ex)));
 
                     sectionDisposables.Add(isReloading.Connect());
                     sectionDisposables.Add(anySectionChanged.Connect());
@@ -322,7 +322,7 @@ private void ApplyPendingChanges(int sectionInfoId)
         {
             Debug.Assert(Thread.CurrentThread.ManagedThreadId == _mainThreadId, "The thread is not the main thread.");
             Debug.Assert(_isCollectingChanges, "Currently there are no changes to collect");
-            this.Log().Debug("[#{0}] Applying pending changes", sectionInfoId);
+            this.Log().Debug(CultureInfo.InvariantCulture, "[#{0}] Applying pending changes", sectionInfoId);
 
             try
             {
@@ -331,7 +331,7 @@ private void ApplyPendingChanges(int sectionInfoId)
                     {
                         if (IsDebugEnabled)
                         {
-                            this.Log().Debug("[#{0}] The pending changes (in order received) are:", sectionInfoId);
+                            this.Log().Debug(CultureInfo.InvariantCulture, "[#{0}] The pending changes (in order received) are:", sectionInfoId);
 
                             foreach (var pendingChange in _pendingChanges)
                             {
@@ -360,7 +360,7 @@ private void ApplyPendingChanges(int sectionInfoId)
 
                             if (allSectionChanges.Any(x => x.Action == NotifyCollectionChangedAction.Reset))
                             {
-                                this.Log().Debug("[#{0}] Section {1} included a reset notification, so reloading that section.", sectionInfoId, section);
+                                this.Log().Debug(CultureInfo.InvariantCulture, "[#{0}] Section {1} included a reset notification, so reloading that section.", sectionInfoId, section);
                                 _adapter.ReloadSections(new NSIndexSet((nuint)section));
                                 continue;
                             }