fix: Fix merge issues

unoplatform · Jun 2, 2021 · a5392e6 · a5392e6
1 parent 70c5afa
commit a5392e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/SourceGenerators/Uno.UI.SourceGenerators/RemoteControl/RemoteControlGenerator.cs b/src/SourceGenerators/Uno.UI.SourceGenerators/RemoteControl/RemoteControlGenerator.cs
@@ -111,8 +111,8 @@ private static void BuildEndPointAttribute(GeneratorExecutionContext context, In
 			{
 				var addresses = NetworkInterface.GetAllNetworkInterfaces()
 					.SelectMany(x => x.GetIPProperties().UnicastAddresses)
-					.Where(x => !IPAddress.IsLoopback(x.Address))
-					.Where(x => x.DuplicateAddressDetectionState == DuplicateAddressDetectionState.Preferred);
+					.Where(x => !IPAddress.IsLoopback(x.Address));
+					//This is not supported on linux yet: .Where(x => x.DuplicateAddressDetectionState == DuplicateAddressDetectionState.Preferred);
 
 				foreach (var addressInfo in addresses)
 				{

diff --git a/src/Uno.UI.RuntimeTests/IntegrationTests/common/CalendarHelper.h.cs b/src/Uno.UI.RuntimeTests/IntegrationTests/common/CalendarHelper.h.cs
@@ -378,7 +378,7 @@ internal static void CheckFocusedItem()
 #if WINDOWS_UWP
 			var item = FocusManager.GetFocusedElement();
 #else
-			var item = FocusManager.GetFocusedElement(TestServices.WindowHelper.WindowContent.XamlRoot);
+			var item = FocusManager.GetFocusedElement((TestServices.WindowHelper.WindowContent as UIElement)?.XamlRoot);
 #endif
 			TestServices.LOG_OUTPUT("Type of focused item is: %s", item.GetType().FullName);
 			var itemAsFE = (FrameworkElement)(item);

diff --git a/src/Uno.UI.RuntimeTests/MUX/Utilities/TestHelpers.cs b/src/Uno.UI.RuntimeTests/MUX/Utilities/TestHelpers.cs
@@ -103,8 +103,8 @@ public class App
 	{
 		public static UIElement TestContentRoot
 		{
-			get => TestServices.WindowHelper.WindowContent;
-			set => TestServices.WindowHelper.WindowContent = value as UIElement;
+			get => TestServices.WindowHelper.WindowContent as UIElement;
+			set => TestServices.WindowHelper.WindowContent = value;
 		}
 
 		public static Application Current => Application.Current;