Merge pull request #83 from OneSignal/user-model/dotnet7-upgrade

[User Model] Upgrade to .NET 7
OneSignal · Jan 5, 2024 · 046bdef · 046bdef
2 parents 67ace7d + 47d3e07
commit 046bdef
Show file tree

Hide file tree

Showing 201 changed files with 3,838 additions and 757 deletions.
diff --git a/OneSignalSDK.DotNet.Android.Core.Binding/Jars/core-release.aar b/OneSignalSDK.DotNet.Android.Core.Binding/Jars/core-release.aar
diff --git a/OneSignalSDK.DotNet.Android.Core.Binding/OneSignalSDK.DotNet.Android.Core.Binding.csproj b/OneSignalSDK.DotNet.Android.Core.Binding/OneSignalSDK.DotNet.Android.Core.Binding.csproj
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Xamarin.Legacy.Sdk/0.2.0-alpha3">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <TargetFrameworks>net6.0-android31;monoandroid12.0</TargetFrameworks>
+    <TargetFrameworks>net7.0-android</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Jars/in-app-messages-release.aar b/OneSignalSDK.DotNet.Android.InAppMessages.Binding/Jars/in-app-messages-release.aar
diff --git a/...et.Android.InAppMessages.Binding/OneSignalSDK.DotNet.Android.InAppMessages.Binding.csproj b/...et.Android.InAppMessages.Binding/OneSignalSDK.DotNet.Android.InAppMessages.Binding.csproj
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Xamarin.Legacy.Sdk/0.2.0-alpha3">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <TargetFrameworks>net6.0-android31;monoandroid12.0</TargetFrameworks>
+    <TargetFrameworks>net7.0-android</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/OneSignalSDK.DotNet.Android.Location.Binding/Jars/location-release.aar b/OneSignalSDK.DotNet.Android.Location.Binding/Jars/location-release.aar
diff --git a/...alSDK.DotNet.Android.Location.Binding/OneSignalSDK.DotNet.Android.Location.Binding.csproj b/...alSDK.DotNet.Android.Location.Binding/OneSignalSDK.DotNet.Android.Location.Binding.csproj
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Xamarin.Legacy.Sdk/0.2.0-alpha3">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <TargetFrameworks>net6.0-android31;monoandroid12.0</TargetFrameworks>
+    <TargetFrameworks>net7.0-android</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/OneSignalSDK.DotNet.Android.Notifications.Binding/Jars/notifications-release.aar b/OneSignalSDK.DotNet.Android.Notifications.Binding/Jars/notifications-release.aar
diff --git a/...et.Android.Notifications.Binding/OneSignalSDK.DotNet.Android.Notifications.Binding.csproj b/...et.Android.Notifications.Binding/OneSignalSDK.DotNet.Android.Notifications.Binding.csproj
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Xamarin.Legacy.Sdk/0.2.0-alpha3">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <TargetFrameworks>net6.0-android31;monoandroid12.0</TargetFrameworks>
+    <TargetFrameworks>net7.0-android</TargetFrameworks>
     <IsBindingProject>true</IsBindingProject>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/OneSignalSDK.DotNet.Android/AndroidUserManager.cs b/OneSignalSDK.DotNet.Android/AndroidUserManager.cs
@@ -35,6 +35,7 @@ public void Initialize()
         public void AddTags(IDictionary<string, string> tags) => OneSignalNative.User.AddTags(tags);
         public void RemoveTag(string key) => OneSignalNative.User.RemoveTag(key);
         public void RemoveTags(params string[] keys) => OneSignalNative.User.RemoveTags(keys);
+        public IDictionary<string, string> GetTags() => OneSignalNative.User.Tags;
     }
 
     public class AndroidPushSubscription : IPushSubscription

diff --git a/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj b/OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Xamarin.Legacy.Sdk/0.2.0-alpha3">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{FB0C2961-BAFE-4346-B279-3B3941614DCD}</ProjectGuid>
-    <TargetFrameworks>net6.0-android31;monoandroid12.0</TargetFrameworks>
+    <TargetFrameworks>net7.0-android</TargetFrameworks>
     <OutputType>Library</OutputType>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/OneSignalSDK.DotNet.Core/User/IUserManager.cs b/OneSignalSDK.DotNet.Core/User/IUserManager.cs
@@ -126,5 +126,10 @@ public interface IUserManager
         /// </summary>
         /// <param name="keys">The collection of keys, all of which will be removed from the current user.</param>
         void RemoveTags(params string[] keys);
+
+        /// <summary>
+        /// Get the dictionary of data tags for the current user.
+        /// </summary>
+        IDictionary<string, string> GetTags();
     }
 }
diff --git a/OneSignalSDK.DotNet.iOS.Binding/ApiDefinitions.cs b/OneSignalSDK.DotNet.iOS.Binding/ApiDefinitions.cs
@@ -494,6 +494,12 @@ interface OSUser
         [Export ("removeTags:")]
         void RemoveTags(string[] tags);
 
+        // @required -(NSDictionary<NSString *,NSString *>)getTags;
+        //[Abstract]
+        [Export ("getTags")]
+        [return: NullAllowed]
+        NSDictionary<NSString, NSString> GetTags();
+
         // @required -(void)addEmail:(NSString * _Nonnull)email;
         //[Abstract]
         [Export ("addEmail:")]

diff --git a/OneSignalSDK.DotNet.iOS.Binding/OneSignalCore.xcframework/Info.plist b/OneSignalSDK.DotNet.iOS.Binding/OneSignalCore.xcframework/Info.plist
@@ -6,30 +6,30 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>OneSignalCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>OneSignalCore.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>

diff --git a/...SignalCore.xcframework/ios-arm64/OneSignalCore.framework/Headers/OneSignalCommonDefines.h b/...SignalCore.xcframework/ios-arm64/OneSignalCore.framework/Headers/OneSignalCommonDefines.h
@@ -46,7 +46,7 @@
 // "*" in comment line ending comment means the string value has not been changed
 // App
 
-#define ONESIGNAL_VERSION                                                   @"050001"
+#define ONESIGNAL_VERSION                                                   @"050005"
 
 #define OSUD_APP_ID                                                         @"GT_APP_ID"                                                        // * OSUD_APP_ID
 #define OSUD_REGISTERED_WITH_APPLE                                          @"GT_REGISTERED_WITH_APPLE"                                         // * OSUD_REGISTERED_WITH_APPLE

diff --git a/...DotNet.iOS.Binding/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/Info.plist b/...DotNet.iOS.Binding/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/Info.plist
diff --git a/...Net.iOS.Binding/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/OneSignalCore b/...Net.iOS.Binding/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/OneSignalCore
diff --git a/.../OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/_CodeSignature/CodeResources b/.../OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/_CodeSignature/CodeResources
@@ -78,7 +78,7 @@
 		</data>
 		<key>Headers/OneSignalCommonDefines.h</key>
 		<data>
-		tad+KeT+bga4RH8NIYBPtCfJCgg=
+		SG8j5q+Z6fExky4vxn4vwfT4D5Y=
 		</data>
 		<key>Headers/OneSignalConfigManager.h</key>
 		<data>
@@ -126,7 +126,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		V8UeTZvBi+hwmpifOzEeQp3qBVU=
+		5j92A0qIhyoYwuBXYk8Ucin9gQc=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -265,7 +265,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			uKea+bE5o/QJ5H7bQVZBM4KaCo6vtSBj28a02B++tpY=
+			l1n/qWZvLmzj+PhG8acqf110T8rOeDJ+T+Ru+FKBR6g=
 			</data>
 		</dict>
 		<key>Headers/OneSignalConfigManager.h</key>

diff --git a/...64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/Headers/OneSignalCommonDefines.h b/...64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/Headers/OneSignalCommonDefines.h
@@ -46,7 +46,7 @@
 // "*" in comment line ending comment means the string value has not been changed
 // App
 
-#define ONESIGNAL_VERSION                                                   @"050001"
+#define ONESIGNAL_VERSION                                                   @"050005"
 
 #define OSUD_APP_ID                                                         @"GT_APP_ID"                                                        // * OSUD_APP_ID
 #define OSUD_REGISTERED_WITH_APPLE                                          @"GT_REGISTERED_WITH_APPLE"                                         // * OSUD_REGISTERED_WITH_APPLE

diff --git a/...xcframework/ios-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/OneSignalCore b/...xcframework/ios-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/OneSignalCore
diff --git a/...work/ios-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/Resources/Info.plist b/...work/ios-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>22F82</string>
+	<string>23B81</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

diff --git a/...-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/_CodeSignature/CodeResources b/...-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/_CodeSignature/CodeResources
@@ -6,7 +6,7 @@
 	<dict>
 		<key>Resources/Info.plist</key>
 		<data>
-		nWmlazzXzMNV2iuESh6kPWyaoJg=
+		BkFCch7mVZcdA2wPF5SEfMDbkGk=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -141,7 +141,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			uKea+bE5o/QJ5H7bQVZBM4KaCo6vtSBj28a02B++tpY=
+			l1n/qWZvLmzj+PhG8acqf110T8rOeDJ+T+Ru+FKBR6g=
 			</data>
 		</dict>
 		<key>Headers/OneSignalConfigManager.h</key>
@@ -232,7 +232,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			RZRQ2O+hu/Hf7EgiEaTA+P1JA82grTXH9ZuI5CxWvJU=
+			y3RYB55M2LKU2SSaZZhXP4YEAPY7E5CyiXSxIL4mUnY=
 			</data>
 		</dict>
 	</dict>

diff --git a/...ework/ios-arm64_x86_64-simulator/OneSignalCore.framework/Headers/OneSignalCommonDefines.h b/...ework/ios-arm64_x86_64-simulator/OneSignalCore.framework/Headers/OneSignalCommonDefines.h
@@ -46,7 +46,7 @@
 // "*" in comment line ending comment means the string value has not been changed
 // App
 
-#define ONESIGNAL_VERSION                                                   @"050001"
+#define ONESIGNAL_VERSION                                                   @"050005"
 
 #define OSUD_APP_ID                                                         @"GT_APP_ID"                                                        // * OSUD_APP_ID
 #define OSUD_REGISTERED_WITH_APPLE                                          @"GT_REGISTERED_WITH_APPLE"                                         // * OSUD_REGISTERED_WITH_APPLE

diff --git a/...g/OneSignalCore.xcframework/ios-arm64_x86_64-simulator/OneSignalCore.framework/Info.plist b/...g/OneSignalCore.xcframework/ios-arm64_x86_64-simulator/OneSignalCore.framework/Info.plist
diff --git a/...neSignalCore.xcframework/ios-arm64_x86_64-simulator/OneSignalCore.framework/OneSignalCore b/...neSignalCore.xcframework/ios-arm64_x86_64-simulator/OneSignalCore.framework/OneSignalCore
diff --git a/...framework/ios-arm64_x86_64-simulator/OneSignalCore.framework/_CodeSignature/CodeResources b/...framework/ios-arm64_x86_64-simulator/OneSignalCore.framework/_CodeSignature/CodeResources
@@ -78,7 +78,7 @@
 		</data>
 		<key>Headers/OneSignalCommonDefines.h</key>
 		<data>
-		tad+KeT+bga4RH8NIYBPtCfJCgg=
+		SG8j5q+Z6fExky4vxn4vwfT4D5Y=
 		</data>
 		<key>Headers/OneSignalConfigManager.h</key>
 		<data>
@@ -126,7 +126,7 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		9pJRj3QH+B19u9B6F3skt/NDrdg=
+		XkPUJ3HXHTzA0ASZY88QKf6lcPA=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
@@ -265,7 +265,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			uKea+bE5o/QJ5H7bQVZBM4KaCo6vtSBj28a02B++tpY=
+			l1n/qWZvLmzj+PhG8acqf110T8rOeDJ+T+Ru+FKBR6g=
 			</data>
 		</dict>
 		<key>Headers/OneSignalConfigManager.h</key>

diff --git a/OneSignalSDK.DotNet.iOS.Binding/OneSignalExtension.xcframework/Info.plist b/OneSignalSDK.DotNet.iOS.Binding/OneSignalExtension.xcframework/Info.plist
@@ -6,7 +6,7 @@
 	<array>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-simulator</string>
+			<string>ios-arm64_x86_64-maccatalyst</string>
 			<key>LibraryPath</key>
 			<string>OneSignalExtension.framework</string>
 			<key>SupportedArchitectures</key>
@@ -17,34 +17,34 @@
 			<key>SupportedPlatform</key>
 			<string>ios</string>
 			<key>SupportedPlatformVariant</key>
-			<string>simulator</string>
+			<string>maccatalyst</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64</string>
+			<string>ios-arm64_x86_64-simulator</string>
 			<key>LibraryPath</key>
 			<string>OneSignalExtension.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
+				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
 		</dict>
 		<dict>
 			<key>LibraryIdentifier</key>
-			<string>ios-arm64_x86_64-maccatalyst</string>
+			<string>ios-arm64</string>
 			<key>LibraryPath</key>
 			<string>OneSignalExtension.framework</string>
 			<key>SupportedArchitectures</key>
 			<array>
 				<string>arm64</string>
-				<string>x86_64</string>
 			</array>
 			<key>SupportedPlatform</key>
 			<string>ios</string>
-			<key>SupportedPlatformVariant</key>
-			<string>maccatalyst</string>
 		</dict>
 	</array>
 	<key>CFBundlePackageType</key>

diff --git a/....Binding/OneSignalExtension.xcframework/ios-arm64/OneSignalExtension.framework/Info.plist b/....Binding/OneSignalExtension.xcframework/ios-arm64/OneSignalExtension.framework/Info.plist
diff --git a/.../OneSignalExtension.xcframework/ios-arm64/OneSignalExtension.framework/OneSignalExtension b/.../OneSignalExtension.xcframework/ios-arm64/OneSignalExtension.framework/OneSignalExtension
diff --git a/...eSignalExtension.xcframework/ios-arm64/OneSignalExtension.framework/PrivacyInfo.xcprivacy b/...eSignalExtension.xcframework/ios-arm64/OneSignalExtension.framework/PrivacyInfo.xcprivacy
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyCollectedDataTypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeUserID</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyCollectedDataType</key>
+			<string>NSPrivacyCollectedDataTypeProductInteraction</string>
+			<key>NSPrivacyCollectedDataTypeLinked</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypeTracking</key>
+			<false/>
+			<key>NSPrivacyCollectedDataTypePurposes</key>
+			<array>
+				<string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>CA92.1</string>
+			</array>
+		</dict>
+	</array>
+	<key>NSPrivacyTracking</key>
+	<false/>
+</dict>
+</plist>
diff --git a/...Extension.xcframework/ios-arm64/OneSignalExtension.framework/_CodeSignature/CodeResources b/...Extension.xcframework/ios-arm64/OneSignalExtension.framework/_CodeSignature/CodeResources
@@ -26,12 +26,16 @@
 		</data>
 		<key>Info.plist</key>
 		<data>
-		p7Y7XDq7Nj+qnaY5sKooDWJVOX4=
+		7HlcW6AuOT07ua/ecfcRV+CNRLU=
 		</data>
 		<key>Modules/module.modulemap</key>
 		<data>
 		MniqwSJOOQq7kIj/mIrXwnwSVlU=
 		</data>
+		<key>PrivacyInfo.xcprivacy</key>
+		<data>
+		z0nfsDi7mdXLVAhLoBccLVx0TaQ=
+		</data>
 	</dict>
 	<key>files2</key>
 	<dict>
@@ -77,6 +81,13 @@
 			tDPf+7yPnc5GbW/ygIzPKJ0ZkgW0SgdPvoOOrivzzvw=
 			</data>
 		</dict>
+		<key>PrivacyInfo.xcprivacy</key>
+		<dict>
+			<key>hash2</key>
+			<data>
+			MxaDwVmcnkDSqiLbNG4U0OYlc6UDhnUXTO0K0aB8V+s=
+			</data>
+		</dict>
 	</dict>
 	<key>rules</key>
 	<dict>

diff --git a/...k/ios-arm64_x86_64-maccatalyst/OneSignalExtension.framework/Versions/A/OneSignalExtension b/...k/ios-arm64_x86_64-maccatalyst/OneSignalExtension.framework/Versions/A/OneSignalExtension
diff --git a/...ios-arm64_x86_64-maccatalyst/OneSignalExtension.framework/Versions/A/Resources/Info.plist b/...ios-arm64_x86_64-maccatalyst/OneSignalExtension.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>22F82</string>
+	<string>23B81</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>