Merge branch 'master' into feature/context-menus-obey-screen-edges

src/Avalonia.Visuals/Rendering/DefaultRenderLoop.cs

@@ -41,12 +41,12 @@ namespace Avalonia.Rendering
         {
             add
             {
+                _tick += value;
+
                 if (_subscriberCount++ == 0)
                 {
                     Start();
                 }
-
-                _tick += value;
             }
 
             remove

src/Windows/Avalonia.Win32/ScreenImpl.cs

@@ -2,16 +2,9 @@
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
 using System;
-using System.Linq;
-using Avalonia.Controls;
 using Avalonia.Platform;
-using Avalonia.Utilities;
 using static Avalonia.Win32.Interop.UnmanagedMethods;
 
-#if NETSTANDARD
-using Win32Exception = Avalonia.Win32.NetStandard.AvaloniaWin32Exception;
-#endif
-
 namespace Avalonia.Win32
 {
     public class ScreenImpl : IScreenImpl

src/Windows/Avalonia.Win32/Win32Platform.cs

@@ -1,27 +1,23 @@
 // Copyright (c) The Avalonia Project. All rights reserved.
 // Licensed under the MIT license. See licence.md file in the project root for full license information.
 
-using Avalonia.Input.Platform;
 using System;
 using System.Collections.Generic;
-using System.Reactive.Disposables;
+using System.ComponentModel;
 using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Reactive.Disposables;
 using System.Runtime.InteropServices;
 using System.Threading;
+using Avalonia.Controls;
 using Avalonia.Controls.Platform;
 using Avalonia.Input;
+using Avalonia.Input.Platform;
 using Avalonia.Platform;
-using Avalonia.Win32.Input;
-using Avalonia.Win32.Interop;
-using Avalonia.Controls;
 using Avalonia.Rendering;
 using Avalonia.Threading;
-using System.IO;
-#if NETSTANDARD
-using Win32Exception = Avalonia.Win32.NetStandard.AvaloniaWin32Exception;
-#else
-using System.ComponentModel;
-#endif
+using Avalonia.Win32.Input;
+using Avalonia.Win32.Interop;
 
 namespace Avalonia
 {

tests/Avalonia.Markup.UnitTests/Data/BindingExpressionTests.cs

@@ -58,7 +58,7 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public async Task Should_Convert_Get_String_To_Double()
         {
-            var data = new Class1 { StringValue = "5.6" };
+            var data = new Class1 { StringValue = $"{5.6}" };
             var target = new BindingExpression(new ExpressionObserver(data, "StringValue"), typeof(double));
             var result = await target.Take(1);
 
@@ -94,12 +94,12 @@ namespace Avalonia.Markup.UnitTests.Data
         [Fact]
         public void Should_Convert_Set_String_To_Double()
         {
-            var data = new Class1 { StringValue = (5.6).ToString() };
+            var data = new Class1 { StringValue = $"{5.6}" };
             var target = new BindingExpression(new ExpressionObserver(data, "StringValue"), typeof(double));
 
             target.OnNext(6.7);
 
-            Assert.Equal((6.7).ToString(), data.StringValue);
+            Assert.Equal($"{6.7}", data.StringValue);
 
             GC.KeepAlive(data);
         }
@@ -111,7 +111,7 @@ namespace Avalonia.Markup.UnitTests.Data
             var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue"), typeof(string));
             var result = await target.Take(1);
 
-            Assert.Equal((5.6).ToString(), result);
+            Assert.Equal($"{5.6}", result);
 
             GC.KeepAlive(data);
         }
@@ -122,7 +122,7 @@ namespace Avalonia.Markup.UnitTests.Data
             var data = new Class1 { DoubleValue = 5.6 };
             var target = new BindingExpression(new ExpressionObserver(data, "DoubleValue"), typeof(string));
 
-            target.OnNext("6.7");
+            target.OnNext($"{6.7}");
 
             Assert.Equal(6.7, data.DoubleValue);
 
@@ -318,15 +318,15 @@ namespace Avalonia.Markup.UnitTests.Data
 
             target.Subscribe(x => result.Add(x));
             target.OnNext(1.2);
-            target.OnNext("3.4");
+            target.OnNext($"{3.4}");
             target.OnNext("bar");
 
             Assert.Equal(
                 new[]
                 {
-                    new BindingNotification("5.6"),
-                    new BindingNotification("1.2"),
-                    new BindingNotification("3.4"),
+                    new BindingNotification($"{5.6}"),
+                    new BindingNotification($"{1.2}"),
+                    new BindingNotification($"{3.4}"),
                     new BindingNotification(
                         new InvalidCastException("'bar' is not a valid number."),
                         BindingErrorType.Error)