diff --git a/Acr.UserDialogs.sln b/Acr.UserDialogs.sln
index e08eeb02..d4e3c7f3 100644
--- a/Acr.UserDialogs.sln
+++ b/Acr.UserDialogs.sln
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.github\workflows\build.yml = .github\workflows\build.yml
version.json = version.json
Build.slnf = Build.slnf
- global.json = global.json
icon.png = icon.png
readme.md = readme.md
EndProjectSection
diff --git a/global.json b/global.json
deleted file mode 100644
index 1e4abc8c..00000000
--- a/global.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
- "sdk": {
- "version": "6.0.400",
- "rollForward": "latestFeature",
- "allowPrereleases": true
- }
-}
\ No newline at end of file
diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj
index 3c407ad9..b40af8ef 100644
--- a/sample/Sample/Sample.csproj
+++ b/sample/Sample/Sample.csproj
@@ -1,7 +1,7 @@
- net6.0-android;net6.0-ios;net6.0-maccatalyst
+ net8.0-android;net8.0-ios;net8.0-maccatalyst
Exe
Sample
true
@@ -33,8 +33,8 @@
-
-
+
+
diff --git a/src/Acr.UserDialogs/Acr.UserDialogs.csproj b/src/Acr.UserDialogs/Acr.UserDialogs.csproj
index 47eb62b7..abe629a2 100644
--- a/src/Acr.UserDialogs/Acr.UserDialogs.csproj
+++ b/src/Acr.UserDialogs/Acr.UserDialogs.csproj
@@ -1,14 +1,6 @@
- true
- 3.0.44
-
-
-
-
-
- net6.0;net6.0-ios;net6.0-android;net6.0-maccatalyst
- $(TargetFrameworks);netstandard2.0;xamarin.ios10;monoandroid12.0
+ net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst
https://github.com/aritchie/userdialogs
$(AssemblyName) ($(TargetFramework))
Allan Ritchie
@@ -30,53 +22,31 @@
snupkg
True
True
-
-
-
- true
-
-
-
- $(DefineConstants);ANDROIDX
+ true
-
-
+
+
all
runtime; build; native; contentfiles; analyzers
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
-
\ No newline at end of file
diff --git a/src/Acr.UserDialogs/Platforms/Android/Builders/ActionSheetBuilder.cs b/src/Acr.UserDialogs/Platforms/Android/Builders/ActionSheetBuilder.cs
index 119a0453..d0718d99 100644
--- a/src/Acr.UserDialogs/Platforms/Android/Builders/ActionSheetBuilder.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/Builders/ActionSheetBuilder.cs
@@ -1,13 +1,8 @@
using System;
using System.Linq;
using Android.App;
-#if ANDROIDX
using AndroidX.AppCompat.App;
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
-#else
-using Android.Support.V7.App;
-using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
-#endif
using AlertDialog = Android.App.AlertDialog;
diff --git a/src/Acr.UserDialogs/Platforms/Android/Builders/AlertBuilder.cs b/src/Acr.UserDialogs/Platforms/Android/Builders/AlertBuilder.cs
index d5edd825..90ab637c 100644
--- a/src/Acr.UserDialogs/Platforms/Android/Builders/AlertBuilder.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/Builders/AlertBuilder.cs
@@ -1,13 +1,8 @@
using System;
using Android.App;
using AlertDialog = Android.App.AlertDialog;
-#if ANDROIDX
using AndroidX.AppCompat.App;
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
-#else
-using Android.Support.V7.App;
-using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
-#endif
namespace Acr.UserDialogs.Builders
diff --git a/src/Acr.UserDialogs/Platforms/Android/Builders/ConfirmBuilder.cs b/src/Acr.UserDialogs/Platforms/Android/Builders/ConfirmBuilder.cs
index c80eafce..dcdc7a73 100644
--- a/src/Acr.UserDialogs/Platforms/Android/Builders/ConfirmBuilder.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/Builders/ConfirmBuilder.cs
@@ -1,13 +1,9 @@
using System;
using Android.App;
using AlertDialog = Android.App.AlertDialog;
-#if ANDROIDX
using AndroidX.AppCompat.App;
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
-#else
-using Android.Support.V7.App;
-using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
-#endif
+
namespace Acr.UserDialogs.Builders
{
diff --git a/src/Acr.UserDialogs/Platforms/Android/Builders/IAlertDialogBuilder.cs b/src/Acr.UserDialogs/Platforms/Android/Builders/IAlertDialogBuilder.cs
index 03b07e9e..25317d2f 100644
--- a/src/Acr.UserDialogs/Platforms/Android/Builders/IAlertDialogBuilder.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/Builders/IAlertDialogBuilder.cs
@@ -1,10 +1,7 @@
using System;
using Android.App;
-#if ANDROIDX
using AndroidX.AppCompat.App;
-#else
-using Android.Support.V7.App;
-#endif
+
namespace Acr.UserDialogs.Builders
{
diff --git a/src/Acr.UserDialogs/Platforms/Android/Builders/LoginBuilder.cs b/src/Acr.UserDialogs/Platforms/Android/Builders/LoginBuilder.cs
index 0d195658..783074f9 100644
--- a/src/Acr.UserDialogs/Platforms/Android/Builders/LoginBuilder.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/Builders/LoginBuilder.cs
@@ -4,13 +4,8 @@
using Android.Views;
using Android.Widget;
using AlertDialog = Android.App.AlertDialog;
-#if ANDROIDX
using AndroidX.AppCompat.App;
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
-#else
-using Android.Support.V7.App;
-using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
-#endif
namespace Acr.UserDialogs.Builders
diff --git a/src/Acr.UserDialogs/Platforms/Android/Builders/PromptBuilder.cs b/src/Acr.UserDialogs/Platforms/Android/Builders/PromptBuilder.cs
index 20d3e9ee..0c4a4bfe 100644
--- a/src/Acr.UserDialogs/Platforms/Android/Builders/PromptBuilder.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/Builders/PromptBuilder.cs
@@ -7,13 +7,8 @@
using Android.Views.InputMethods;
using Android.Widget;
using AlertDialog = Android.App.AlertDialog;
-#if ANDROIDX
using AndroidX.AppCompat.App;
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
-#else
-using Android.Support.V7.App;
-using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
-#endif
namespace Acr.UserDialogs.Builders
diff --git a/src/Acr.UserDialogs/Platforms/Android/Fragments/AbstractDialogFragment.cs b/src/Acr.UserDialogs/Platforms/Android/Fragments/AbstractDialogFragment.cs
index 88e8eb73..2efd6cb1 100644
--- a/src/Acr.UserDialogs/Platforms/Android/Fragments/AbstractDialogFragment.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/Fragments/AbstractDialogFragment.cs
@@ -3,11 +3,8 @@
using Android.Content;
using Android.OS;
using Android.Views;
-#if ANDROIDX
using AndroidX.AppCompat.App;
-#else
-using Android.Support.V7.App;
-#endif
+
namespace Acr.UserDialogs.Fragments
{
diff --git a/src/Acr.UserDialogs/Platforms/Android/Fragments/BottomSheetDialogFragment.cs b/src/Acr.UserDialogs/Platforms/Android/Fragments/BottomSheetDialogFragment.cs
index 0d12940d..ee688162 100644
--- a/src/Acr.UserDialogs/Platforms/Android/Fragments/BottomSheetDialogFragment.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/Fragments/BottomSheetDialogFragment.cs
@@ -8,11 +8,8 @@
using Android.Views;
using Android.Widget;
using Orientation = Android.Widget.Orientation;
-#if ANDROIDX
using Google.Android.Material.BottomSheet;
-#else
-using Android.Support.Design.Widget;
-#endif
+
namespace Acr.UserDialogs.Fragments
{
diff --git a/src/Acr.UserDialogs/Platforms/Android/Infrastructure/ImageLoader.cs b/src/Acr.UserDialogs/Platforms/Android/Infrastructure/ImageLoader.cs
index a057c30d..25caa1dc 100644
--- a/src/Acr.UserDialogs/Platforms/Android/Infrastructure/ImageLoader.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/Infrastructure/ImageLoader.cs
@@ -2,11 +2,8 @@
using Android.App;
using Android.Graphics.Drawables;
using Android.Util;
-#if ANDROIDX
using AndroidX.Core.Content;
-#else
-using Android.Support.V4.Content;
-#endif
+
namespace Acr.UserDialogs.Infrastructure
{
diff --git a/src/Acr.UserDialogs/Platforms/Android/ProgressDialog.cs b/src/Acr.UserDialogs/Platforms/Android/ProgressDialog.cs
index ff2b1628..92f833db 100644
--- a/src/Acr.UserDialogs/Platforms/Android/ProgressDialog.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/ProgressDialog.cs
@@ -74,7 +74,7 @@ public virtual void Hide()
this.IsShowing = false;
try
{
- AndHUD.Shared.Dismiss(activity);
+ AndHUD.Shared.Dismiss();
}
catch(Exception exc)
{
diff --git a/src/Acr.UserDialogs/Platforms/Android/UserDialogsImpl.cs b/src/Acr.UserDialogs/Platforms/Android/UserDialogsImpl.cs
index 8c208c46..f5dc504d 100644
--- a/src/Acr.UserDialogs/Platforms/Android/UserDialogsImpl.cs
+++ b/src/Acr.UserDialogs/Platforms/Android/UserDialogsImpl.cs
@@ -8,13 +8,8 @@
using Android.Widget;
using Android.Text.Style;
using AndroidHUD;
-#if ANDROIDX
using AndroidX.AppCompat.App;
using Google.Android.Material.Snackbar;
-#else
-using Android.Support.V7.App;
-using Android.Support.Design.Widget;
-#endif
namespace Acr.UserDialogs
@@ -232,7 +227,7 @@ protected virtual IDisposable ToastFallback(Activity activity, ToastConfig cfg)
{
try
{
- AndHUD.Shared.Dismiss(activity);
+ AndHUD.Shared.Dismiss();
}
catch
{
diff --git a/version.json b/version.json
index f9d687db..4ee5ab73 100644
--- a/version.json
+++ b/version.json
@@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
- "version": "8.1.0-alpha.{height}",
+ "version": "9.0.0-alpha.{height}",
"assemblyVersion": {
"precision": "revision"
},