diff --git a/samples/Directory.Packages.props b/samples/Directory.Packages.props
index 9b6a353f0..6dcbd9392 100644
--- a/samples/Directory.Packages.props
+++ b/samples/Directory.Packages.props
@@ -17,7 +17,7 @@
-
+
@@ -30,19 +30,19 @@
-
+
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 8a49a83b4..794ab191e 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -5,7 +5,7 @@
-
+
diff --git a/src/Uno.Toolkit.RuntimeTests/Tests/ItemsRepeaterExtensionTests.cs b/src/Uno.Toolkit.RuntimeTests/Tests/ItemsRepeaterExtensionTests.cs
index dc790af97..70bfa36f8 100644
--- a/src/Uno.Toolkit.RuntimeTests/Tests/ItemsRepeaterExtensionTests.cs
+++ b/src/Uno.Toolkit.RuntimeTests/Tests/ItemsRepeaterExtensionTests.cs
@@ -5,7 +5,6 @@
using System.Text;
using System.Threading.Tasks;
using Microsoft.VisualStudio.TestTools.UnitTesting;
-using Windows.UI.Xaml;
using Uno.Toolkit.RuntimeTests.Helpers;
using Uno.Toolkit.UI;
using Uno.UI.RuntimeTests;
diff --git a/src/Uno.Toolkit.RuntimeTests/Tests/NavigationBarTests.cs b/src/Uno.Toolkit.RuntimeTests/Tests/NavigationBarTests.cs
index 0cd51e223..c4a00c145 100644
--- a/src/Uno.Toolkit.RuntimeTests/Tests/NavigationBarTests.cs
+++ b/src/Uno.Toolkit.RuntimeTests/Tests/NavigationBarTests.cs
@@ -67,23 +67,25 @@ public async Task MainCommand_In_Popup_Without_Page(MainCommandMode mainCommandM
var popup = new Popup { Width = 100, Height = 100, HorizontalOffset = 100, VerticalOffset = 100, Child = new StackPanel { Children = { navigationBar } } };
var content = new StackPanel { Children = { popup } };
- try
+ EventHandler