Add obfuscatedAccountId and obfuscatedProfileId to UpgradePurchasedSubscription

.gitignore

@@ -11,6 +11,8 @@
 *.userprefs
 
 # Build results
+.idea/
+src/.idea/
 [Dd]ebug/
 [Dd]ebugPublic/
 [Rr]elease/

README.md

@@ -1,10 +1,11 @@
-## In-App Billing Plugin for .NET MAUI, Xamarin, and Windows
+## In-App Billing Plugin for .NET MAUI  and Windows
 
-A simple In-App Purchase plugin for .NET MAUI, Xamarin, and Windows to query item information, purchase items, restore items, and more.
+A simple In-App Purchase plugin for .NET MAUI and Windows to query item information, purchase items, restore items, and more.
 
 Subscriptions are supported on iOS, Android, and Mac. Windows/UWP/WinUI 3 - does not support subscriptions at this time.
 
 ## Important Version Information
+* v8 now supports .NET 8+ .NET MAUI and Windows Apps.
 * v7 now supports .NET 6+, .NET MAUI, UWP, and Xamarin/Xamarin.Forms projects
 * v7 is built against Android Billing Library 6.0
 * See migration guides below
@@ -19,13 +20,11 @@ Get started by reading through the [In-App Billing Plugin documentation](https:/
 
 |Platform|Version|
 | ------------------- | :------------------: |
-|Xamarin.iOS & iOS for .NET|10+|
-|Xamarin.Mac, macOS for .NET, macCatlyst for .NET |All|
-|Xamarin.TVOS, tvOS for .NET|10.13.2|
-|Xamarin.Android, Android for .NET|21+|
-|Windows 10 UWP|10+|
+|iOS for .NET|10+|
+|macCatlyst for .NET |All|
+|tvOS for .NET|10.13.2|
+|Android for .NET|21+|
 |Windows App SDK (WinUI 3) |10+|
-|Xamarin.Forms|All|
 |.NET MAUI|All|
 
 ### Created By: [@JamesMontemagno](http://github.com/jamesmontemagno)

docs/CheckAndRestorePurchases.md

@@ -6,8 +6,9 @@ When users get a new device or re-install your application it is best practice t
 /// Get all current purchases for a specified product type.
 /// </summary>
 /// <param name="itemType">Type of product</param>
+/// <param name="cancellationToken">Cancel the request</param>
 /// <returns>The current purchases</returns>
-Task<IEnumerable<InAppBillingPurchase>> GetPurchasesAsync(ItemType itemType);
+Task<IEnumerable<InAppBillingPurchase>> GetPurchasesAsync(ItemType itemType, CancellationToken cancellationToken = default);
 ```
 
 When you make a call to restore a purchase it will prompt for the user to sign in if they haven't yet, so take that into consideration.

docs/PurchaseConsumable.md

@@ -23,9 +23,10 @@ Consumables are unique and work a bit different on each platform and the `Consum
 /// <param name="itemType">Type of product being requested</param>
 /// <param name="obfuscatedAccountId">Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.</param>
 /// <param name="obfuscatedProfileId">Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.</param>
+/// <param name="cancellationToken">Cancel the request.</param>
 /// <returns>Purchase details</returns>
 /// <exception cref="InAppBillingPurchaseException">If an error occurs during processing</exception>
-Task<InAppBillingPurchase> PurchaseAsync(string productId, ItemType itemType, string obfuscatedAccountId = null, string obfuscatedProfileId = null);
+Task<InAppBillingPurchase> PurchaseAsync(string productId, ItemType itemType, string obfuscatedAccountId = null, string obfuscatedProfileId = null, CancellationToken cancellationToken = default);
 ```
 
 #### obfuscatedAccountId & obfuscatedProfileId
@@ -44,9 +45,10 @@ Task<InAppBillingPurchase> PurchaseAsync(string productId, ItemType itemType, st
 /// </summary>
 /// <param name="productId">Id or Sku of product</param>
 /// <param name="transactionIdentifier">Original Purchase Token</param>
+/// <param name="cancellationToken">Cancel the request</param>
 /// <returns>If consumed successful</returns>
 /// <exception cref="InAppBillingPurchaseException">If an error occurs during processing</exception>
-Task<InAppBillingPurchase> ConsumePurchaseAsync(string productId, string transactionIdentifier);
+Task<InAppBillingPurchase> ConsumePurchaseAsync(string productId, string transactionIdentifier, CancellationToken cancellationToken = default);
 ```
 
 

docs/PurchaseNonConsumable.md

@@ -17,9 +17,10 @@ All purchases go through the `PurchaseAsync` method and you must always `Connect
 /// <param name="itemType">Type of product being requested</param>
 /// <param name="obfuscatedAccountId">Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.</param>
 /// <param name="obfuscatedProfileId">Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.</param>
+/// <param name="cancellationToken">Cancel the request</param>
 /// <returns>Purchase details</returns>
 /// <exception cref="InAppBillingPurchaseException">If an error occurs during processing</exception>
-Task<InAppBillingPurchase> PurchaseAsync(string productId, ItemType itemType, string obfuscatedAccountId = null, string obfuscatedProfileId = null);
+Task<InAppBillingPurchase> PurchaseAsync(string productId, ItemType itemType, string obfuscatedAccountId = null, string obfuscatedProfileId = null, CancellationToken cancellationToken = default);
 ```
 
 On Android you must call `FinalizePurchaseAsync` within 3 days when a purchase is validated. Please read the [Android documentation on Pending Transactions](https://developer.android.com/google/play/billing/integrate#pending) for more information.
@@ -52,7 +53,7 @@ public async Task<bool> PurchaseItem(string productId)
         else if(purchase.State == PurchaseState.Purchased)
         {     
             // only need to finalize if on Android unless you turn off auto finalize on iOS
-             var ack = await CrossInAppBilling.Current.FinalizePurchaseAsync(purchase.TransactionIdentifier);
+             var ack = await CrossInAppBilling.Current.FinalizePurchaseAsync([purchase.TransactionIdentifier]);
 
              // Handle if acknowledge was successful or not
         }

docs/PurchaseSubscription.md

@@ -17,9 +17,10 @@ All purchases go through the `PurchaseAsync` method and you must always `Connect
 /// <param name="itemType">Type of product being requested</param>
 /// <param name="obfuscatedAccountId">Specifies an optional obfuscated string that is uniquely associated with the user's account in your app.</param>
 /// <param name="obfuscatedProfileId">Specifies an optional obfuscated string that is uniquely associated with the user's profile in your app.</param>
+/// <param name="cancellationToken">Cancel the request.</param>
 /// <returns>Purchase details</returns>
 /// <exception cref="InAppBillingPurchaseException">If an error occurs during processing</exception>
-Task<InAppBillingPurchase> PurchaseAsync(string productId, ItemType itemType, string obfuscatedAccountId = null, string obfuscatedProfileId = null);
+Task<InAppBillingPurchase> PurchaseAsync(string productId, ItemType itemType, string obfuscatedAccountId = null, string obfuscatedProfileId = null, CancellationToken cancellationToken = default);
 ```
 
 On Android you must call `FinalizePurchaseAsync` within 3 days when a purchase is validated. Please read the [Android documentation on Pending Transactions](https://developer.android.com/google/play/billing/integrate#pending) for more information.
@@ -52,7 +53,7 @@ public async Task<bool> PurchaseItem(string productId, string payload)
         else if(purchase.State == PurchaseState.Purchased)
         {
             //only needed on android unless you turn off auto finalize
-            var ack = await CrossInAppBilling.Current.FinalizePurchaseAsync(purchase.TransactionIdentifier);
+            var ack = await CrossInAppBilling.Current.FinalizePurchaseAsync([purchase.TransactionIdentifier]);
 
             // Handle if acknowledge was successful or not
         }

docs/SecuringPurchases.md

@@ -3,7 +3,7 @@
 Each platform handles security of In-App Purchases a bit different. To handle this whenever you make a purchase you should use the date from the purchase to validate on your backend.
 
 ## Recommended Reading:
-* [Xamarin.iOS Securing Purchases Documentation](https://developer.xamarin.com/guides/ios/platform_features/in-app_purchasing/transactions_and_verification/#Securing_Purchases)
+* [iOS Securing Purchases Documentation](https://developer.xamarin.com/guides/ios/platform_features/in-app_purchasing/transactions_and_verification/#Securing_Purchases)
 * [Google Play service Security and Design](https://developer.android.com/google/play/billing/billing_best_practices.html)
 
 

nuget/readme.txt

@@ -1,28 +1 @@
-In-App Billing Plugin for .NET MAUI, Xamarin, & Windows
-
-Version 7.0+  - Major Android updates
-1.) You must compile and target against Android 12 or higher
-2.) Android: Now using Android Billing v6
-3.) Android: Major changes to Android product details, subscriptions, and more
-
-Please read through: https://developer.android.com/google/play/billing/migrate-gpblv6
-
-
-Version 5.0+ has significant updates!
-1.) We have removed IInAppBillingVerifyPurchase from all methods. All data required to handle this yourself is returned.
-2.) iOS ReceiptURL data is avaialble via ReceiptData
-3.) We are now using Android Billing version 4
-4.) Major breaking chanages across the API including AcknowledgePurchaseAsync being changed to FinalizePurchaseAsync
-5.) Tons of new APIs when you get information about products
-
-Please read documentation for all changes at https://github.com/jamesmontemagno/InAppBillingPlugin
-
-Version 4.0 has significant updates.
-
-1.) You must compile and target against Android 10 or higher
-2.) On Android you must handle pending transactions and call `FinalizePurchaseAsync` when done
-3.) On Android HandleActivityResult has been removed.
-4.) We now use Xamarin.Essentials and setup is required per docs.
-
-Find the latest setup guides, documentation, and testing instructions at: 
-https://github.com/jamesmontemagno/InAppBillingPlugin
+This is until our pull request from compusport/plugin.inappbilling is merged into the main repository.