Merge 6475ccd into 525fd07

jamesmontemagno · Oct 3, 2024 · 0425cf3 · 0425cf3
2 parents 525fd07 + 6475ccd
commit 0425cf3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/global.json b/global.json
@@ -0,0 +1,7 @@
+{
+  "sdk": {
+    "version": "8.0.400",
+    "rollForward": "latestFeature",
+    "allowPrerelease": true
+  }
+}
diff --git a/src/Plugin.InAppBilling/InAppBilling.android.cs b/src/Plugin.InAppBilling/InAppBilling.android.cs
@@ -133,7 +133,6 @@ public override Task DisconnectAsync(CancellationToken cancellationToken)
             return Task.CompletedTask;
         }
 
-
         /// <summary>
         /// Gets or sets if in testing mode. Only for UWP
         /// </summary>
@@ -483,6 +482,7 @@ static bool ParseBillingResult(BillingResult result, bool ignoreInvalidProducts
             return result.ResponseCode switch
             {
                 BillingResponseCode.Ok => true,
+                BillingResponseCode.NetworkError => throw new InAppBillingPurchaseException(PurchaseError.NetworkError),
                 BillingResponseCode.UserCancelled => throw new InAppBillingPurchaseException(PurchaseError.UserCancelled),//User Cancelled, should try again
                 BillingResponseCode.ServiceUnavailable => throw new InAppBillingPurchaseException(PurchaseError.ServiceUnavailable),//Network connection is down
                 BillingResponseCode.ServiceDisconnected => throw new InAppBillingPurchaseException(PurchaseError.ServiceDisconnected),//Network connection is down

diff --git a/src/Plugin.InAppBilling/Plugin.InAppBilling.csproj b/src/Plugin.InAppBilling/Plugin.InAppBilling.csproj
@@ -9,9 +9,9 @@
     <AssemblyName>Plugin.InAppBilling</AssemblyName>
     <RootNamespace>Plugin.InAppBilling</RootNamespace>
     <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <AssemblyVersion>7.0.0.0</AssemblyVersion>
-    <AssemblyFileVersion>7.0.0.0</AssemblyFileVersion>
-    <Version>7.0.0.0</Version>
+    <AssemblyVersion>9.0.0.0</AssemblyVersion>
+    <AssemblyFileVersion>9.0.0.0</AssemblyFileVersion>
+    <Version>9.0.0.0</Version>
     <Authors>James Montemagno</Authors>
     <IsPackable>True</IsPackable>
     <PackageId>Plugin.InAppBilling</PackageId>
@@ -95,33 +95,33 @@
 
   <ItemGroup Condition=" $(TargetFramework.Contains('-android')) ">
     <PackageReference Include="Microsoft.Maui.Essentials" Version="$(MauiVersion)" />
-    <PackageReference Include="Xamarin.Android.Google.BillingClient" Version="6.2.1" />
+    <PackageReference Include="Xamarin.Android.Google.BillingClient" Version="7.1.0" />
     <PackageReference Include="Xamarin.AndroidX.Activity">
-      <Version>1.9.0.4</Version>
+      <Version>1.9.2.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Activity.Ktx">
-      <Version>1.9.0.4</Version>
+      <Version>1.9.2.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Collection">
-      <Version>1.4.0.6</Version>
+      <Version>1.4.3.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Collection.Ktx">
-      <Version>1.4.0.5</Version>
+      <Version>1.4.3.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData">
-      <Version>2.8.3.1</Version>
+      <Version>2.8.5.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData.Core">
-      <Version>2.8.3.1</Version>
+      <Version>2.8.5.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime">
-      <Version>2.8.3.1</Version>
+      <Version>2.8.5.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModel">
-      <Version>2.8.3.1</Version>
+      <Version>2.8.5.1</Version>
     </PackageReference>
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.ViewModelSavedState">
-      <Version>2.8.3.1</Version>
+      <Version>2.8.5.1</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/src/Plugin.InAppBilling/Shared/InAppBillingExceptions.shared.cs b/src/Plugin.InAppBilling/Shared/InAppBillingExceptions.shared.cs
@@ -70,8 +70,9 @@ public enum PurchaseError
         FeatureNotSupported,
         ServiceDisconnected,
         ServiceTimeout,
-        AppleTermsConditionsChanged
-	}
+        AppleTermsConditionsChanged,
+        NetworkError
+    }
 
     /// <summary>
     /// Purchase exception