Skip to content

Commit 51ef521

Browse files
SebastianStehleSebastianStehle
committed
Fixes.
1 parent de9190a commit 51ef521

File tree

8 files changed

+134
-663
lines changed

8 files changed

+134
-663
lines changed

‎New Text Document.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎sdk/Notifo.SDK.FirebasePlugin/Notifo.SDK.FirebasePlugin.csproj

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

3-
<PropertyGroup>
4-
<TargetFrameworks>netstandard2.1;xamarinios10;monoandroid12.0;</TargetFrameworks>
5-
<LangVersion>8.0</LangVersion>
6-
<Nullable>enable</Nullable>
7-
<RootNamespace>Notifo.SDK.FirebasePlugin</RootNamespace>
8-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
9-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
10-
<AssemblyName>Notifo.Xamarin.FirebasePlugin</AssemblyName>
11-
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
12-
<RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
13-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFrameworks>netstandard2.1;xamarinios10;monoandroid12.0;</TargetFrameworks>
5+
<LangVersion>8.0</LangVersion>
6+
<RootNamespace>Notifo.SDK.FirebasePlugin</RootNamespace>
7+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9+
<AssemblyName>Notifo.Xamarin.FirebasePlugin</AssemblyName>
10+
<RunAnalyzersDuringBuild>false</RunAnalyzersDuringBuild>
11+
<RunAnalyzersDuringLiveAnalysis>false</RunAnalyzersDuringLiveAnalysis>
12+
<NoWarn>CS1591;CS0618</NoWarn>
13+
</PropertyGroup>
1414

15-
<ItemGroup>
16-
<None Include="logo-squared.png" Pack="true" PackagePath="\" />
17-
</ItemGroup>
15+
<ItemGroup>
16+
<None Include="logo-squared.png" Pack="true" PackagePath="\" />
17+
</ItemGroup>
1818

19-
<ItemGroup>
20-
<Compile Remove="**\*.netstandard.cs" />
21-
<Compile Remove="**\*.android.cs" />
22-
<Compile Remove="**\*.ios.cs" />
23-
</ItemGroup>
19+
<ItemGroup>
20+
<Compile Remove="**\*.netstandard.cs" />
21+
<Compile Remove="**\*.android.cs" />
22+
<Compile Remove="**\*.ios.cs" />
23+
</ItemGroup>
2424

25-
<ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) ">
26-
<None Include="**\*.netstandard.cs" />
27-
<Compile Include="**\*.android.cs" />
28-
<None Include="**\*.ios.cs" />
29-
</ItemGroup>
25+
<ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) ">
26+
<None Include="**\*.netstandard.cs" />
27+
<Compile Include="**\*.android.cs" />
28+
<None Include="**\*.ios.cs" />
29+
</ItemGroup>
3030

31-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
32-
<Compile Include="**\*.netstandard.cs" />
33-
<None Include="**\*.android.cs" />
34-
<None Include="**\*.ios.cs" />
35-
</ItemGroup>
31+
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
32+
<Compile Include="**\*.netstandard.cs" />
33+
<None Include="**\*.android.cs" />
34+
<None Include="**\*.ios.cs" />
35+
</ItemGroup>
3636

37-
<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinios')) ">
38-
<None Include="**\*.netstandard.cs" />
39-
<None Include="**\*.android.cs" />
40-
<Compile Include="**\*.ios.cs" />
41-
<PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0" />
42-
<PackageReference Include="Xamarin.Firebase.iOS.Installations" Version="8.10.0" />
43-
<PackageReference Include="Xamarin.Firebase.iOS.Core" Version="8.10.0" />
44-
<PackageReference Include="Xamarin.Firebase.iOS.InstanceID" Version="4.8.0" />
45-
</ItemGroup>
37+
<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinios')) ">
38+
<None Include="**\*.netstandard.cs" />
39+
<None Include="**\*.android.cs" />
40+
<Compile Include="**\*.ios.cs" />
41+
<PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0" />
42+
<PackageReference Include="Xamarin.Firebase.iOS.Installations" Version="8.10.0" />
43+
<PackageReference Include="Xamarin.Firebase.iOS.Core" Version="8.10.0" />
44+
<PackageReference Include="Xamarin.Firebase.iOS.InstanceID" Version="4.8.0" />
45+
</ItemGroup>
4646

47-
<ItemGroup>
48-
<PackageReference Include="Notifo.SDK" Version="1.2.0" />
49-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
50-
<PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0.1" />
51-
<PackageReference Include="Xamarin.Firebase.iOS.Core" Version="8.10.0.1" />
52-
<PackageReference Include="Xamarin.Firebase.iOS.Installations" Version="8.10.0.1" />
53-
</ItemGroup>
47+
<ItemGroup>
48+
<PackageReference Include="Notifo.SDK" Version="1.2.0" />
49+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
50+
<PackageReference Include="Xamarin.Firebase.iOS.CloudMessaging" Version="8.10.0.1" />
51+
<PackageReference Include="Xamarin.Firebase.iOS.Core" Version="8.10.0.1" />
52+
<PackageReference Include="Xamarin.Firebase.iOS.Installations" Version="8.10.0.1" />
53+
</ItemGroup>
5454

55-
<ItemGroup>
56-
<ProjectReference Include="..\Notifo.SDK\Notifo.SDK.Core.csproj" />
57-
</ItemGroup>
55+
<ItemGroup>
56+
<ProjectReference Include="..\Notifo.SDK\Notifo.SDK.Core.csproj" />
57+
</ItemGroup>
5858

59-
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid12.0'">
60-
<PackageReference Include="Xamarin.Firebase.Common">
61-
<Version>120.0.0.5</Version>
62-
</PackageReference>
63-
<PackageReference Include="Xamarin.Firebase.Messaging">
64-
<Version>122.0.0.5</Version>
65-
</PackageReference>
66-
</ItemGroup>
67-
</Project>
59+
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid12.0'">
60+
<PackageReference Include="Xamarin.Firebase.Common">
61+
<Version>120.0.0.5</Version>
62+
</PackageReference>
63+
<PackageReference Include="Xamarin.Firebase.Messaging">
64+
<Version>122.0.0.5</Version>
65+
</PackageReference>
66+
</ItemGroup>
67+
</Project>

‎sdk/Notifo.SDK.FirebasePlugin/NotifoFirebasePlugin.android.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public class NotifoFirebasePlugin
2525
/// <param name="notificationHandler">The <see cref="INotificationHandler"/> implementation.</param>
2626
/// <param name="resetToken">Set to <see langword="true"/> while debugging.</param>
2727
/// <param name="autoRegistration">Automatically register for push notifications.</param>
28-
public static void Initialize(Context context, INotifoStartup notifoStartup, INotificationHandler? notificationHandler = null, bool resetToken = false, bool autoRegistration = true)
28+
public static void Initialize(Context context, INotifoStartup notifoStartup, INotificationHandler notificationHandler = null, bool resetToken = false, bool autoRegistration = true)
2929
{
3030
FirebasePushNotificationManager.Initialize(context, new NotifoPushNotificationHandler(), resetToken, createDefaultNotificationChannel: true, autoRegistration);
3131

‎sdk/Notifo.SDK.FirebasePlugin/NotifoFirebasePlugin.ios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class NotifoFirebasePlugin
2828
/// <param name="notifoStartup">The <see cref="INotifoStartup"/> implementation.</param>
2929
/// <param name="notificationHandler">The <see cref="INotificationHandler"/> implementation.</param>
3030
/// <param name="autoRegistration">Automatically register for push notifications.</param>
31-
public static void Initialize(NSDictionary options, INotifoStartup notifoStartup, INotificationHandler? notificationHandler = null, bool autoRegistration = true)
31+
public static void Initialize(NSDictionary options, INotifoStartup notifoStartup, INotificationHandler notificationHandler = null, bool autoRegistration = true)
3232
{
3333
FirebasePushNotificationManager.Initialize(options, autoRegistration);
3434

‎sdk/Notifo.SDK.FirebasePlugin/PluginEventsProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ namespace Notifo.SDK.FirebasePlugin
1515
{
1616
internal class PluginEventsProvider : IPushEventsProvider
1717
{
18-
public event EventHandler<TokenRefreshEventArgs>? OnTokenRefresh;
19-
public event EventHandler<Notifo.SDK.NotificationEventArgs>? OnNotificationReceived;
20-
public event EventHandler<Notifo.SDK.NotificationEventArgs>? OnNotificationOpened;
18+
public event EventHandler<TokenRefreshEventArgs> OnTokenRefresh;
19+
public event EventHandler<Notifo.SDK.NotificationEventArgs> OnNotificationReceived;
20+
public event EventHandler<Notifo.SDK.NotificationEventArgs> OnNotificationOpened;
2121
public event EventHandler<Notifo.SDK.NotificationErrorEventArgs> OnError;
2222

2323
public PluginEventsProvider()

‎sdk/Notifo.SDK/Notifo.SDK.Core.csproj

Lines changed: 72 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,84 @@
11
<Project Sdk="MSBuild.Sdk.Extras/3.0.22">
2-
<PropertyGroup>
3-
<TargetFrameworks>netstandard2.1;xamarinios10;monoandroid12.0;</TargetFrameworks>
4-
<RootNamespace>Notifo.SDK</RootNamespace>
5-
<LangVersion>9.0</LangVersion>
6-
<Nullable>enable</Nullable>
7-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9-
</PropertyGroup>
2+
<PropertyGroup>
3+
<TargetFrameworks>netstandard2.1;xamarinios10;monoandroid12.0;</TargetFrameworks>
4+
<RootNamespace>Notifo.SDK</RootNamespace>
5+
<LangVersion>9.0</LangVersion>
6+
<Nullable>enable</Nullable>
7+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
8+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
9+
</PropertyGroup>
1010

11-
<ItemGroup>
12-
<None Include="logo-squared.png" Pack="true" PackagePath="\" />
13-
</ItemGroup>
11+
<ItemGroup>
12+
<None Include="logo-squared.png" Pack="true" PackagePath="\" />
13+
</ItemGroup>
1414

15-
<PropertyGroup>
16-
<CodeAnalysisRuleSet>..\..\Notifo.ruleset</CodeAnalysisRuleSet>
17-
<AssemblyName>Notifo.Xamarin.Core</AssemblyName>
18-
</PropertyGroup>
15+
<PropertyGroup>
16+
<CodeAnalysisRuleSet>..\..\Notifo.ruleset</CodeAnalysisRuleSet>
17+
<AssemblyName>Notifo.Xamarin.Core</AssemblyName>
18+
</PropertyGroup>
1919

20-
<ItemGroup>
21-
<AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
22-
</ItemGroup>
20+
<ItemGroup>
21+
<AdditionalFiles Include="..\..\stylecop.json" Link="stylecop.json" />
22+
</ItemGroup>
2323

24+
<ItemGroup>
25+
<Compile Remove="**\*.netstandard.cs" />
26+
<Compile Remove="**\*.android.cs" />
27+
<Compile Remove="**\*.ios.cs" />
28+
</ItemGroup>
2429

30+
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
31+
<Compile Include="**\*.netstandard.cs" />
32+
<None Include="**\*.android.cs" />
33+
<None Include="**\*.ios.cs" />
34+
</ItemGroup>
2535

26-
<ItemGroup>
27-
<Compile Remove="**\*.netstandard.cs" />
28-
<Compile Remove="**\*.android.cs" />
29-
<Compile Remove="**\*.ios.cs" />
30-
</ItemGroup>
36+
<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinios')) ">
37+
<None Include="**\*.netstandard.cs" />
38+
<None Include="**\*.android.cs" />
39+
<Compile Include="**\*.ios.cs" />
40+
</ItemGroup>
3141

42+
<ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) ">
43+
<None Include="**\*.netstandard.cs" />
44+
<Compile Include="**\*.android.cs" />
45+
<None Include="**\*.ios.cs" />
46+
</ItemGroup>
3247

33-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
34-
<Compile Include="**\*.netstandard.cs" />
35-
<None Include="**\*.android.cs" />
36-
<None Include="**\*.ios.cs" />
37-
</ItemGroup>
48+
<ItemGroup>
49+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
50+
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.1" />
51+
<PackageReference Include="Notifo.SDK" Version="1.2.0" />
52+
<PackageReference Include="Polly" Version="7.2.1" />
53+
<PackageReference Include="RefactoringEssentials" Version="5.6.0">
54+
<PrivateAssets>all</PrivateAssets>
55+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
56+
</PackageReference>
57+
<PackageReference Include="Serilog" Version="2.10.0" />
58+
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
59+
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
60+
<PrivateAssets>all</PrivateAssets>
61+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
62+
</PackageReference>
63+
<PackageReference Include="Xam.Plugin.Connectivity" Version="3.2.0" />
64+
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
65+
</ItemGroup>
3866

39-
<ItemGroup Condition=" $(TargetFramework.StartsWith('xamarinios')) ">
40-
<None Include="**\*.netstandard.cs" />
41-
<None Include="**\*.android.cs" />
42-
<Compile Include="**\*.ios.cs" />
43-
</ItemGroup>
67+
<ItemGroup Condition="'$(TargetFramework)' == 'xamarinios10'">
68+
<PackageReference Include="Serilog.Sinks.Xamarin">
69+
<Version>0.2.0.64</Version>
70+
</PackageReference>
71+
</ItemGroup>
4472

45-
<ItemGroup Condition=" $(TargetFramework.StartsWith('monoandroid')) ">
46-
<None Include="**\*.netstandard.cs" />
47-
<Compile Include="**\*.android.cs" />
48-
<None Include="**\*.ios.cs" />
49-
</ItemGroup>
73+
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid12.0'">
74+
<PackageReference Include="Serilog.Sinks.Xamarin">
75+
<Version>0.2.0.64</Version>
76+
</PackageReference>
77+
</ItemGroup>
5078

51-
52-
<ItemGroup>
53-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0" />
54-
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.1" />
55-
<PackageReference Include="Notifo.SDK" Version="1.2.0" />
56-
<PackageReference Include="Polly" Version="7.2.1" />
57-
<PackageReference Include="RefactoringEssentials" Version="5.6.0">
58-
<PrivateAssets>all</PrivateAssets>
59-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
60-
</PackageReference>
61-
<PackageReference Include="Serilog" Version="2.10.0" />
62-
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
63-
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
64-
<PrivateAssets>all</PrivateAssets>
65-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
66-
</PackageReference>
67-
<PackageReference Include="System.Text.Json" Version="5.0.1" />
68-
<PackageReference Include="Xam.Plugin.Connectivity" Version="3.2.0" />
69-
<PackageReference Include="Xamarin.Essentials" Version="1.6.1" />
70-
</ItemGroup>
71-
72-
<ItemGroup Condition="'$(TargetFramework)' == 'xamarinios10'">
73-
<PackageReference Include="Serilog.Sinks.Xamarin">
74-
<Version>0.2.0.64</Version>
75-
</PackageReference>
76-
</ItemGroup>
77-
78-
<ItemGroup Condition="'$(TargetFramework)' == 'monoandroid12.0'">
79-
<PackageReference Include="Serilog.Sinks.Xamarin">
80-
<Version>0.2.0.64</Version>
81-
</PackageReference>
82-
</ItemGroup>
83-
84-
<ItemGroup>
85-
<Compile Update="Resources\Strings.Designer.cs">
86-
<DesignTime>True</DesignTime>
87-
</Compile>
88-
</ItemGroup>
89-
</Project>
79+
<ItemGroup>
80+
<Compile Update="Resources\Strings.Designer.cs">
81+
<DesignTime>True</DesignTime>
82+
</Compile>
83+
</ItemGroup>
84+
</Project>

‎tests/Notifo.SDK.UnitTests/Mocks/EventsProviderMock.cs

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)