From 2bffec1d0cca0c39486cb1fa3eb759a156a01a0f Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Thu, 30 Apr 2026 11:37:47 -0700
Subject: [PATCH 1/2] fix(android): add missing deps for native core 5.8.0+

---
 .../OneSignalSDK.DotNet.Android.csproj               | 12 +++++++++---
 OneSignalSDK.DotNet.nuspec                           | 10 ++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj b/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj
index 84ff6941..59315483 100644
--- a/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj
+++ b/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj
@@ -53,17 +53,23 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.9.23.3" />
-    <PackageReference Include="Xamarin.KotlinX.Coroutines.Core" Version="1.6.4.2" />
-    <PackageReference Include="Xamarin.KotlinX.Coroutines.Android" Version="1.6.4.2" />
+    <PackageReference Include="Xamarin.KotlinX.Coroutines.Core" Version="1.7.3.3" />
+    <PackageReference Include="Xamarin.KotlinX.Coroutines.Android" Version="1.7.3.3" />
+    <!-- Required by FeatureFlagsJsonParser in native core 5.8.0+ -->
+    <PackageReference Include="Xamarin.KotlinX.Serialization.Json" Version="1.7.3.5" />
     <PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.16" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.14" />
     <PackageReference Include="Xamarin.AndroidX.Browser" Version="1.4.0.2" />
     <PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.4.2.1" />
     <PackageReference Include="Xamarin.AndroidX.Work.Runtime" Version="2.7.1.5" />
+    <PackageReference Include="Xamarin.AndroidX.Work.Work.Runtime.Ktx" Version="2.7.1.5" />
+    <!-- Required by FeatureFlagsRefreshService in native core 5.8.0+ -->
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" Version="2.6.2.3" />
+    <PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" Version="2.6.2.3" />
+    <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.7.2.2" />
     <PackageReference Include="Xamarin.Firebase.Messaging" Version="123.0.8" />
     <!-- Dagger is required for FCM, should be a "transitive dependency" but is not due to this bug: https://github.com/xamarin/XamarinComponents/issues/1069 -->
     <PackageReference Include="Xamarin.Google.Dagger" Version="2.41.0.2" />
     <PackageReference Include="Xamarin.GooglePlayServices.Base" Version="118.1.0" />
-    <PackageReference Include="Xamarin.AndroidX.Work.Work.Runtime.Ktx" Version="2.7.1.5" />
   </ItemGroup>
 </Project>
diff --git a/OneSignalSDK.DotNet.nuspec b/OneSignalSDK.DotNet.nuspec
index 97b7cc2d..eb823443 100644
--- a/OneSignalSDK.DotNet.nuspec
+++ b/OneSignalSDK.DotNet.nuspec
@@ -22,8 +22,10 @@
             </group>
             <group targetFramework="net10.0-android21.0">
                 <dependency id="Xamarin.Kotlin.StdLib.Jdk8" version="1.9.23.3" />
-                <dependency id="Xamarin.KotlinX.Coroutines.Core" version="1.6.4.2" />
-                <dependency id="Xamarin.KotlinX.Coroutines.Android" version="1.6.4.2" />
+                <dependency id="Xamarin.KotlinX.Coroutines.Core" version="1.7.3.3" />
+                <dependency id="Xamarin.KotlinX.Coroutines.Android" version="1.7.3.3" />
+                <!-- Required by FeatureFlagsJsonParser in native core 5.8.0+ -->
+                <dependency id="Xamarin.KotlinX.Serialization.Json" version="1.7.3.5" />
 
                 <dependency id="Xamarin.AndroidX.CardView" version="1.0.0.16" />
                 <dependency id="Xamarin.AndroidX.Legacy.Support.V4" version="1.0.0.14" />
@@ -31,6 +33,10 @@
                 <dependency id="Xamarin.AndroidX.AppCompat" version="1.4.2.1" />
                 <dependency id="Xamarin.AndroidX.Work.Runtime" version="2.7.1.5" />
                 <dependency id="Xamarin.AndroidX.Work.Work.Runtime.Ktx" version="2.7.1.5" />
+                <!-- Required by FeatureFlagsRefreshService in native core 5.8.0+ -->
+                <dependency id="Xamarin.AndroidX.Lifecycle.ViewModel.Ktx" version="2.6.2.3" />
+                <dependency id="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" version="2.6.2.3" />
+                <dependency id="Xamarin.AndroidX.Activity.Ktx" version="1.7.2.2" />
 
                 <dependency id="Xamarin.Firebase.Messaging" version="123.0.8" />
                 <!-- Dagger is required for FCM, should be a "transitive dependency" but is not due to this bug:

From b6593e405523119883ad70292fedf32d978850a3 Mon Sep 17 00:00:00 2001
From: Fadi George <fadii925@gmail.com>
Date: Thu, 30 Apr 2026 12:16:51 -0700
Subject: [PATCH 2/2] style: reformat conditional TargetFrameworks XML

---
 OneSignalSDK.DotNet/OneSignalSDK.DotNet.csproj | 4 +++-
 examples/demo/demo.csproj                      | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/OneSignalSDK.DotNet/OneSignalSDK.DotNet.csproj b/OneSignalSDK.DotNet/OneSignalSDK.DotNet.csproj
index 0a86454e..b1080eac 100644
--- a/OneSignalSDK.DotNet/OneSignalSDK.DotNet.csproj
+++ b/OneSignalSDK.DotNet/OneSignalSDK.DotNet.csproj
@@ -12,7 +12,9 @@
       ships all four TFMs.
     -->
     <TargetFrameworks>net10.0;net10.0-android;netstandard2.0</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net10.0-ios</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('OSX'))"
+      >$(TargetFrameworks);net10.0-ios</TargetFrameworks
+    >
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <LangVersion>10.0</LangVersion>
diff --git a/examples/demo/demo.csproj b/examples/demo/demo.csproj
index e356ed70..bbbfe0e2 100644
--- a/examples/demo/demo.csproj
+++ b/examples/demo/demo.csproj
@@ -8,7 +8,9 @@
       NETSDK1178 looking for Microsoft.iOS.Sdk.
     -->
     <TargetFrameworks>net10.0-android</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(TargetFrameworks);net10.0-ios</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('OSX'))"
+      >$(TargetFrameworks);net10.0-ios</TargetFrameworks
+    >
     <OutputType>Exe</OutputType>
     <RootNamespace>OneSignalDemo</RootNamespace>
     <UseMaui>true</UseMaui>