Skip to content

Commit a5392e6

Browse files
committed
fix: Fix merge issues
1 parent 70c5afa commit a5392e6

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/SourceGenerators/Uno.UI.SourceGenerators/RemoteControl/RemoteControlGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ private static void BuildEndPointAttribute(GeneratorExecutionContext context, In
111111
{
112112
var addresses = NetworkInterface.GetAllNetworkInterfaces()
113113
.SelectMany(x => x.GetIPProperties().UnicastAddresses)
114-
.Where(x => !IPAddress.IsLoopback(x.Address))
115-
.Where(x => x.DuplicateAddressDetectionState == DuplicateAddressDetectionState.Preferred);
114+
.Where(x => !IPAddress.IsLoopback(x.Address));
115+
//This is not supported on linux yet: .Where(x => x.DuplicateAddressDetectionState == DuplicateAddressDetectionState.Preferred);
116116

117117
foreach (var addressInfo in addresses)
118118
{

src/Uno.UI.RuntimeTests/IntegrationTests/common/CalendarHelper.h.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ internal static void CheckFocusedItem()
378378
#if WINDOWS_UWP
379379
var item = FocusManager.GetFocusedElement();
380380
#else
381-
var item = FocusManager.GetFocusedElement(TestServices.WindowHelper.WindowContent.XamlRoot);
381+
var item = FocusManager.GetFocusedElement((TestServices.WindowHelper.WindowContent as UIElement)?.XamlRoot);
382382
#endif
383383
TestServices.LOG_OUTPUT("Type of focused item is: %s", item.GetType().FullName);
384384
var itemAsFE = (FrameworkElement)(item);

src/Uno.UI.RuntimeTests/MUX/Utilities/TestHelpers.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ public class App
103103
{
104104
public static UIElement TestContentRoot
105105
{
106-
get => TestServices.WindowHelper.WindowContent;
107-
set => TestServices.WindowHelper.WindowContent = value as UIElement;
106+
get => TestServices.WindowHelper.WindowContent as UIElement;
107+
set => TestServices.WindowHelper.WindowContent = value;
108108
}
109109

110110
public static Application Current => Application.Current;

0 commit comments

Comments
 (0)