diff --git a/cd-pipeline.yml b/cd-pipeline.yml
index 1c553d3..482ede0 100644
--- a/cd-pipeline.yml
+++ b/cd-pipeline.yml
@@ -1,5 +1,5 @@
variables:
- MONO_VERSION: 6_4_0
+ MONO_VERSION: 6_12_24
NETCORE_VERSION: '3.0.x'
# set the version numbering, this results in 1.0.1 for the first build incrementing that way.
diff --git a/ci-pipeline.yml b/ci-pipeline.yml
index c18971c..4319388 100644
--- a/ci-pipeline.yml
+++ b/ci-pipeline.yml
@@ -1,7 +1,7 @@
variables:
- MONO_VERSION: 6_4_0
+ MONO_VERSION: 6_12_24
NETCORE_VERSION: '3.0.x'
- XCODE_VERSION: 11.1
+ XCODE_VERSION: 14.2
# Starter pipeline
# Start with a minimal pipeline that you can customize to build and deploy your code.
@@ -18,7 +18,7 @@ pr:
# The type of machine this build should run on and what software should be on it
pool:
- vmImage: macos-10.14
+ vmImage: macOS-latest
# The different steps in our build
steps:
diff --git a/nuget/Plugin.nuspec b/nuget/Plugin.nuspec
index 752099a..0d2df13 100644
--- a/nuget/Plugin.nuspec
+++ b/nuget/Plugin.nuspec
@@ -19,13 +19,13 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/src/Plugin.AzurePushNotification/AzurePushNotificationManager.android.cs b/src/Plugin.AzurePushNotification/AzurePushNotificationManager.android.cs
index 41fc8fc..f5d2bc3 100644
--- a/src/Plugin.AzurePushNotification/AzurePushNotificationManager.android.cs
+++ b/src/Plugin.AzurePushNotification/AzurePushNotificationManager.android.cs
@@ -187,7 +187,7 @@ public static void Initialize(Context context, string notificationHubConnectionS
async Task GetTokenAsync()
{
_tokenTcs = new TaskCompletionSource();
- FirebaseInstanceId.Instance.GetInstanceId().AddOnCompleteListener(this);
+ FirebaseMessaging.Instance.GetToken().AddOnCompleteListener(this);
string retVal = null;
@@ -254,7 +254,7 @@ void CleanUp(bool clearAll = true)
CrossAzurePushNotification.Current.UnregisterAsync();
}
- FirebaseInstanceId.Instance.DeleteInstanceId();
+ FirebaseMessaging.Instance.DeleteToken();
Token = string.Empty;
}
@@ -494,7 +494,7 @@ public void OnComplete(Android.Gms.Tasks.Task task)
{
if (task.IsSuccessful)
{
- string token = task.Result.JavaCast().Token;
+ var token = task.Result.ToString();
_tokenTcs?.TrySetResult(token);
}
else
diff --git a/src/Plugin.AzurePushNotification/Plugin.AzurePushNotification.csproj b/src/Plugin.AzurePushNotification/Plugin.AzurePushNotification.csproj
index ee1e151..f3febf8 100644
--- a/src/Plugin.AzurePushNotification/Plugin.AzurePushNotification.csproj
+++ b/src/Plugin.AzurePushNotification/Plugin.AzurePushNotification.csproj
@@ -1,7 +1,7 @@
- netstandard2.0;MonoAndroid90;MonoAndroid10.0;Xamarin.iOS10;
+ netstandard2.0;MonoAndroid10.0;Xamarin.iOS10;
Plugin.AzurePushNotification
Plugin.AzurePushNotification
Plugin.AzurePushNotification
@@ -64,15 +64,15 @@
-
-
-
+
+
+
-
+