Skip to content
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

Jump to bottom

[User Model] Upgrade to .NET 7 #83

Merged
merged 19 commits into from
Jan 5, 2024
Merged

[User Model] Upgrade to .NET 7 #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
98bcf2c
use .net7 in nuspec and remove xamarin
emawby Nov 27, 2023
bd48da2
bump sample app to .net 7
emawby Nov 27, 2023
663c90e
update dotnet csproj to 7
emawby Nov 27, 2023
7a81e53
Update iOS project and binding project to .net 7
emawby Nov 27, 2023
eae9880
Android use dotnet 7 SDK
emawby Nov 27, 2023
59a4c24
Update example app to .net 7
emawby Nov 29, 2023
e64aeb3
updates to allow vscode builds
emawby Nov 30, 2023
61206ba
Make OneSignalSDK.DotNet have a platform-specific target frameworks
emawby Dec 11, 2023
b983878
Fixing failure for mac catalyst
emawby Dec 15, 2023
de8eb8c
removing self contained to fix android build
emawby Dec 19, 2023
fffef98
Creating a new dotnet 8 maui dev app
emawby Nov 30, 2023
3508fc7
move existing app functionality into new one
emawby Nov 30, 2023
7f058c1
temp trying to solve targetinvocationexception
emawby Dec 11, 2023
06ba210
Make OneSignalSDK.DotNet have a platform-specific target frameworks
brismithers Dec 14, 2023
995603b
add GetTags to iOS and core
emawby Dec 18, 2023
870d19a
Update iOS native binaries
emawby Dec 18, 2023
f238b51
Update native Android dependencies
emawby Dec 18, 2023
db58658
add GetTags to AndroidUserManager
emawby Dec 18, 2023
47d3e07
Merge pull request #84 from OneSignal/user-model/getTags
emawby Jan 5, 2024
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
Binary file modified OneSignalSDK.DotNet.Android.Core.Binding/Jars/core-release.aar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions OneSignalSDK.DotNet.Android.Core.Binding/OneSignalSDK.DotNet.Android.Core.Binding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Binary file modified OneSignalSDK.DotNet.Android.InAppMessages.Binding/Jars/in-app-messages-release.aar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...et.Android.InAppMessages.Binding/OneSignalSDK.DotNet.Android.InAppMessages.Binding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Binary file modified OneSignalSDK.DotNet.Android.Location.Binding/Jars/location-release.aar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...alSDK.DotNet.Android.Location.Binding/OneSignalSDK.DotNet.Android.Location.Binding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
Binary file modified OneSignalSDK.DotNet.Android.Notifications.Binding/Jars/notifications-release.aar
View file
Open in desktop
Binary file not shown.
4 changes: 2 additions & 2 deletions ...et.Android.Notifications.Binding/OneSignalSDK.DotNet.Android.Notifications.Binding.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
1 change: 1 addition & 0 deletions OneSignalSDK.DotNet.Android/AndroidUserManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions OneSignalSDK.DotNet.Android/OneSignalSDK.DotNet.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
5 changes: 5 additions & 0 deletions OneSignalSDK.DotNet.Core/User/IUserManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}
6 changes: 6 additions & 0 deletions OneSignalSDK.DotNet.iOS.Binding/ApiDefinitions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:")]
Expand Down
10 changes: 5 additions & 5 deletions OneSignalSDK.DotNet.iOS.Binding/OneSignalCore.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...SignalCore.xcframework/ios-arm64/OneSignalCore.framework/Headers/OneSignalCommonDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified ...DotNet.iOS.Binding/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified ...Net.iOS.Binding/OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/OneSignalCore
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions .../OneSignalCore.xcframework/ios-arm64/OneSignalCore.framework/_CodeSignature/CodeResources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</data>
<key>Headers/OneSignalCommonDefines.h</key>
<data>
tad+KeT+bga4RH8NIYBPtCfJCgg=
SG8j5q+Z6fExky4vxn4vwfT4D5Y=
</data>
<key>Headers/OneSignalConfigManager.h</key>
<data>
Expand Down Expand Up @@ -126,7 +126,7 @@
</data>
<key>Info.plist</key>
<data>
V8UeTZvBi+hwmpifOzEeQp3qBVU=
5j92A0qIhyoYwuBXYk8Ucin9gQc=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion ...64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/Headers/OneSignalCommonDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified ...xcframework/ios-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/OneSignalCore
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...work/ios-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/Resources/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ...-arm64_x86_64-maccatalyst/OneSignalCore.framework/Versions/A/_CodeSignature/CodeResources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<dict>
<key>Resources/Info.plist</key>
<data>
nWmlazzXzMNV2iuESh6kPWyaoJg=
BkFCch7mVZcdA2wPF5SEfMDbkGk=
</data>
</dict>
<key>files2</key>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -232,7 +232,7 @@
<dict>
<key>hash2</key>
<data>
RZRQ2O+hu/Hf7EgiEaTA+P1JA82grTXH9ZuI5CxWvJU=
y3RYB55M2LKU2SSaZZhXP4YEAPY7E5CyiXSxIL4mUnY=
</data>
</dict>
</dict>
Expand Down
2 changes: 1 addition & 1 deletion ...ework/ios-arm64_x86_64-simulator/OneSignalCore.framework/Headers/OneSignalCommonDefines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file modified ...g/OneSignalCore.xcframework/ios-arm64_x86_64-simulator/OneSignalCore.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified ...neSignalCore.xcframework/ios-arm64_x86_64-simulator/OneSignalCore.framework/OneSignalCore
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions ...framework/ios-arm64_x86_64-simulator/OneSignalCore.framework/_CodeSignature/CodeResources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
</data>
<key>Headers/OneSignalCommonDefines.h</key>
<data>
tad+KeT+bga4RH8NIYBPtCfJCgg=
SG8j5q+Z6fExky4vxn4vwfT4D5Y=
</data>
<key>Headers/OneSignalConfigManager.h</key>
<data>
Expand Down Expand Up @@ -126,7 +126,7 @@
</data>
<key>Info.plist</key>
<data>
9pJRj3QH+B19u9B6F3skt/NDrdg=
XkPUJ3HXHTzA0ASZY88QKf6lcPA=
</data>
<key>Modules/module.modulemap</key>
<data>
Expand Down Expand Up @@ -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>
Expand Down
14 changes: 7 additions & 7 deletions OneSignalSDK.DotNet.iOS.Binding/OneSignalExtension.xcframework/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Binary file modified ....Binding/OneSignalExtension.xcframework/ios-arm64/OneSignalExtension.framework/Info.plist
View file
Open in desktop
Binary file not shown.
Binary file modified .../OneSignalExtension.xcframework/ios-arm64/OneSignalExtension.framework/OneSignalExtension
View file
Open in desktop
Binary file not shown.
46 changes: 46 additions & 0 deletions ...eSignalExtension.xcframework/ios-arm64/OneSignalExtension.framework/PrivacyInfo.xcprivacy
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
13 changes: 12 additions & 1 deletion ...Extension.xcframework/ios-arm64/OneSignalExtension.framework/_CodeSignature/CodeResources
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Binary file modified ...k/ios-arm64_x86_64-maccatalyst/OneSignalExtension.framework/Versions/A/OneSignalExtension
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion ...ios-arm64_x86_64-maccatalyst/OneSignalExtension.framework/Versions/A/Resources/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading
Loading