Skip to content

Commit 3e2a425

Browse files
committed
Package updates
- Android updates - iOS updates - Latest MacOS version
1 parent 31fa9e9 commit 3e2a425

File tree

4 files changed

+14
-14
lines changed

4 files changed

+14
-14
lines changed

ci-pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pr:
1818

1919
# The type of machine this build should run on and what software should be on it
2020
pool:
21-
vmImage: macos-10.14
21+
vmImage: macOS-latest
2222

2323
# The different steps in our build
2424
steps:

nuget/Plugin.nuspec

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@
1919
<group targetFramework="netstandard1.0">
2020
<dependency id="NETStandard.Library" version="1.6.1" />
2121
</group>
22-
<group targetFramework="MonoAndroid80">
23-
<dependency id="Xamarin.Firebase.Messaging" version="[60.1142.1]" />
24-
<dependency id="Xamarin.Azure.NotificationHubs.Android" version="0.4.0" />
25-
<dependency id="Xamarin.Android.Support.v4" version="26.0.2" />
22+
<group targetFramework="MonoAndroid10">
23+
<dependency id="Xamarin.Firebase.Messaging" version="[122.0.0]" />
24+
<dependency id="Xamarin.Azure.NotificationHubs.Android" version="1.1.4.1" />
25+
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3" />
2626
</group>
2727
<group targetFramework="Xamarin.iOS10">
28-
<dependency id="Xamarin.Azure.NotificationHubs.iOS" version="1.2.5.2" />
28+
<dependency id="Xamarin.Azure.NotificationHubs.iOS" version="3.1.1" />
2929
</group>
3030
</dependencies>
3131
</metadata>

src/Plugin.AzurePushNotification/AzurePushNotificationManager.android.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public static void Initialize(Context context, string notificationHubConnectionS
187187
async Task<string> GetTokenAsync()
188188
{
189189
_tokenTcs = new TaskCompletionSource<string>();
190-
FirebaseInstanceId.Instance.GetInstanceId().AddOnCompleteListener(this);
190+
FirebaseMessaging.Instance.GetToken().AddOnCompleteListener(this);
191191

192192
string retVal = null;
193193

@@ -254,7 +254,7 @@ void CleanUp(bool clearAll = true)
254254
CrossAzurePushNotification.Current.UnregisterAsync();
255255
}
256256

257-
FirebaseInstanceId.Instance.DeleteInstanceId();
257+
FirebaseMessaging.Instance.DeleteToken();
258258
Token = string.Empty;
259259

260260
}
@@ -494,7 +494,7 @@ public void OnComplete(Android.Gms.Tasks.Task task)
494494
{
495495
if (task.IsSuccessful)
496496
{
497-
string token = task.Result.JavaCast<IInstanceIdResult>().Token;
497+
var token = task.Result.ToString();
498498
_tokenTcs?.TrySetResult(token);
499499
}
500500
else

src/Plugin.AzurePushNotification/Plugin.AzurePushNotification.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="MSBuild.Sdk.Extras/2.0.41">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.0;MonoAndroid90;MonoAndroid10.0;Xamarin.iOS10;</TargetFrameworks>
4+
<TargetFrameworks>netstandard2.0;MonoAndroid10.0;Xamarin.iOS10;</TargetFrameworks>
55
<AssemblyName>Plugin.AzurePushNotification</AssemblyName>
66
<RootNamespace>Plugin.AzurePushNotification</RootNamespace>
77
<PackageId>Plugin.AzurePushNotification</PackageId>
@@ -64,15 +64,15 @@
6464
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
6565
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
6666
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
67-
<PackageReference Include="Xamarin.Azure.NotificationHubs.Android" Version="0.6.0" />
68-
<PackageReference Include="Xamarin.Firebase.Messaging" Version="71.1740.0" />
69-
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="71.1601.0" />
67+
<PackageReference Include="Xamarin.Azure.NotificationHubs.Android" Version="1.1.4.1" />
68+
<PackageReference Include="Xamarin.Firebase.Messaging" Version="122.0.0" />
69+
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.2.1" />
7070
<Compile Include="**\*.android.cs" />
7171
<Compile Include="**\*.android.*.cs" />
7272
</ItemGroup>
7373

7474
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
75-
<PackageReference Include="Xamarin.Azure.NotificationHubs.iOS" Version="2.0.4" />
75+
<PackageReference Include="Xamarin.Azure.NotificationHubs.iOS" Version="3.1.1" />
7676
<Compile Include="**\*.apple.cs" />
7777
<Compile Include="**\*.apple.*.cs" />
7878
</ItemGroup>

0 commit comments

Comments
 (0)