Skip to content

Package updates #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Package updates #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cd-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
6 changes: 3 additions & 3 deletions ci-pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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:
Expand Down
10 changes: 5 additions & 5 deletions nuget/Plugin.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
<group targetFramework="netstandard1.0">
<dependency id="NETStandard.Library" version="1.6.1" />
</group>
<group targetFramework="MonoAndroid80">
<dependency id="Xamarin.Firebase.Messaging" version="[60.1142.1]" />
<dependency id="Xamarin.Azure.NotificationHubs.Android" version="0.4.0" />
<dependency id="Xamarin.Android.Support.v4" version="26.0.2" />
<group targetFramework="MonoAndroid10">
<dependency id="Xamarin.Firebase.Messaging" version="[122.0.0]" />
<dependency id="Xamarin.Azure.NotificationHubs.Android" version="1.1.4.1" />
<dependency id="Xamarin.Android.Support.v4" version="28.0.0.3" />
</group>
<group targetFramework="Xamarin.iOS10">
<dependency id="Xamarin.Azure.NotificationHubs.iOS" version="1.2.5.2" />
<dependency id="Xamarin.Azure.NotificationHubs.iOS" version="3.1.1" />
</group>
</dependencies>
</metadata>
Expand Down
6 changes: 3 additions & 3 deletions src/Plugin.AzurePushNotification/AzurePushNotificationManager.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public static void Initialize(Context context, string notificationHubConnectionS
async Task<string> GetTokenAsync()
{
_tokenTcs = new TaskCompletionSource<string>();
FirebaseInstanceId.Instance.GetInstanceId().AddOnCompleteListener(this);
FirebaseMessaging.Instance.GetToken().AddOnCompleteListener(this);

string retVal = null;

Expand Down Expand Up @@ -254,7 +254,7 @@ void CleanUp(bool clearAll = true)
CrossAzurePushNotification.Current.UnregisterAsync();
}

FirebaseInstanceId.Instance.DeleteInstanceId();
FirebaseMessaging.Instance.DeleteToken();
Token = string.Empty;

}
Expand Down Expand Up @@ -494,7 +494,7 @@ public void OnComplete(Android.Gms.Tasks.Task task)
{
if (task.IsSuccessful)
{
string token = task.Result.JavaCast<IInstanceIdResult>().Token;
var token = task.Result.ToString();
_tokenTcs?.TrySetResult(token);
}
else
Expand Down
10 changes: 5 additions & 5 deletions src/Plugin.AzurePushNotification/Plugin.AzurePushNotification.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="MSBuild.Sdk.Extras/2.0.41">

<PropertyGroup>
<TargetFrameworks>netstandard2.0;MonoAndroid90;MonoAndroid10.0;Xamarin.iOS10;</TargetFrameworks>
<TargetFrameworks>netstandard2.0;MonoAndroid10.0;Xamarin.iOS10;</TargetFrameworks>
<AssemblyName>Plugin.AzurePushNotification</AssemblyName>
<RootNamespace>Plugin.AzurePushNotification</RootNamespace>
<PackageId>Plugin.AzurePushNotification</PackageId>
Expand Down Expand Up @@ -64,15 +64,15 @@
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.0.3" />
<PackageReference Include="Xamarin.Azure.NotificationHubs.Android" Version="0.6.0" />
<PackageReference Include="Xamarin.Firebase.Messaging" Version="71.1740.0" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="71.1601.0" />
<PackageReference Include="Xamarin.Azure.NotificationHubs.Android" Version="1.1.4.1" />
<PackageReference Include="Xamarin.Firebase.Messaging" Version="122.0.0" />
<PackageReference Include="Xamarin.GooglePlayServices.Tasks" Version="117.2.1" />
<Compile Include="**\*.android.cs" />
<Compile Include="**\*.android.*.cs" />
</ItemGroup>

<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
<PackageReference Include="Xamarin.Azure.NotificationHubs.iOS" Version="2.0.4" />
<PackageReference Include="Xamarin.Azure.NotificationHubs.iOS" Version="3.1.1" />
<Compile Include="**\*.apple.cs" />
<Compile Include="**\*.apple.*.cs" />
</ItemGroup>
Expand Down