From 0153c13223af857f0dbbfa0c643e69a8d1f8926b Mon Sep 17 00:00:00 2001
From: Max Schiffer <72544898+maxschiffer@users.noreply.github.com>
Date: Thu, 9 Nov 2023 15:59:01 +0100
Subject: [PATCH] Fixed UWP and Xamarin build (#574)
Fixed the failing Azure pipeline UWP build:
Changed generic EventHandler to now as PublishStateChangedEventHandler typed EventHandler. This fixed the errors in the UWP build.
Fixed the Xamarin build:
The msbuild for Android SDK 25 (Android 7.1) seems to be non-functional. Could not reproduce the exact same behavior locally - might also be caused by an error in the Azure pipeline configuration. (If the pipeline fails in the PR, I'll just remove the Xamarin related change...)
---
Samples/Controls/Subscriptions/SubscriptionDlg.xaml.cs | 4 ++--
.../XamarinClient.Android/UA Xamarin Client.Android.csproj | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Samples/Controls/Subscriptions/SubscriptionDlg.xaml.cs b/Samples/Controls/Subscriptions/SubscriptionDlg.xaml.cs
index fc82dff58..0f1dfdc78 100644
--- a/Samples/Controls/Subscriptions/SubscriptionDlg.xaml.cs
+++ b/Samples/Controls/Subscriptions/SubscriptionDlg.xaml.cs
@@ -77,7 +77,7 @@ public SubscriptionDlg()
m_SessionNotification = new NotificationEventHandler(Session_Notification);
m_SubscriptionStateChanged = new SubscriptionStateChangedEventHandler(Subscription_StateChanged);
- m_PublishStatusChanged = new EventHandler(Subscription_PublishStatusChanged);
+ m_PublishStatusChanged = new PublishStateChangedEventHandler(Subscription_PublishStatusChanged);
}
#endregion
@@ -85,7 +85,7 @@ public SubscriptionDlg()
private Subscription m_subscription;
private NotificationEventHandler m_SessionNotification;
private SubscriptionStateChangedEventHandler m_SubscriptionStateChanged;
- private EventHandler m_PublishStatusChanged;
+ private PublishStateChangedEventHandler m_PublishStatusChanged;
#endregion
#region Public Interface
diff --git a/Samples/XamarinClient/XamarinClient.Android/UA Xamarin Client.Android.csproj b/Samples/XamarinClient/XamarinClient.Android/UA Xamarin Client.Android.csproj
index 889680fe6..d0929aec2 100644
--- a/Samples/XamarinClient/XamarinClient.Android/UA Xamarin Client.Android.csproj
+++ b/Samples/XamarinClient/XamarinClient.Android/UA Xamarin Client.Android.csproj
@@ -8,7 +8,7 @@
Library
XamarinClient.Droid
XamarinClient.Android
- v7.1
+ v8.1
True
Resources\Resource.designer.cs
Resource
@@ -98,4 +98,4 @@
-
\ No newline at end of file
+