Updating libraries, moving to net8, removing classic xamarin

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

sample/Sample/Sample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>Sample</RootNamespace>
     <UseMaui>true</UseMaui>
@@ -33,8 +33,8 @@
     <MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
   </ItemGroup>
 
-
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Acr.UserDialogs\Acr.UserDialogs.csproj" />
+      <PackageReference Include="Microsoft.Maui.Controls" Version="8.0.10" />
+      <ProjectReference Include="..\..\src\Acr.UserDialogs\Acr.UserDialogs.csproj" />
   </ItemGroup>
 </Project>

src/Acr.UserDialogs/Acr.UserDialogs.csproj

@@ -1,14 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <UseMSBuild Condition="$([MSBuild]::IsOSPlatform('windows'))">true</UseMSBuild>
-        <MSBuildSdkExtrasVersion>3.0.44</MSBuildSdkExtrasVersion>
-    </PropertyGroup>
-
-    <Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
-
-    <PropertyGroup>
-        <TargetFrameworks>net6.0;net6.0-ios;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
-        <TargetFrameworks Condition="'$(UseMSBuild)' == 'true'">$(TargetFrameworks);netstandard2.0;xamarin.ios10;monoandroid12.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
         <PackageProjectUrl>https://github.com/aritchie/userdialogs</PackageProjectUrl>
         <Product>$(AssemblyName) ($(TargetFramework))</Product>
         <Authors>Allan Ritchie</Authors>
@@ -30,53 +22,31 @@
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <PublishRepositoryUrl>True</PublishRepositoryUrl>
         <EmbedUntrackedSources>True</EmbedUntrackedSources>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true' OR '$(CI)' == 'true'">
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    </PropertyGroup>
-
-    <PropertyGroup Condition=" $(TargetFramework.Contains('android')) ">
-        <DefineConstants>$(DefineConstants);ANDROIDX</DefineConstants>
+        <ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true' OR '$(CI)' == 'true'">true</ContinuousIntegrationBuild>
     </PropertyGroup>
 
     <ItemGroup>
         <None Include="readme.txt" pack="true" PackagePath="." />
         <None Include="Platforms\**\*.*" />
         <Compile Remove="Platforms\**\*.*" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-        <PackageReference Include="Nerdbank.GitVersioning" Version="3.5.109">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+        <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 
-    <ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
-        <Reference Include="OpenTK-1.0" />
-        <!--<Reference Include="../OpenTK-1.0.dll" />-->
-    </ItemGroup>
-
-    <ItemGroup Condition="$(TargetFramework.Contains('mono'))">
-        <Reference Include="System.Drawing.Common" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
-        <Compile Include="Platforms\Shared\**\*.cs" />
-    </ItemGroup>
-
     <ItemGroup Condition=" $(TargetFramework.Contains('android')) ">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\Android\**\*.cs" />
-        <PackageReference Include="AndHUD" Version="1.5.0" />
-        <PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.0" />
+        <PackageReference Include="AndHUD" Version="2.0.1" />
+        <PackageReference Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />
     </ItemGroup>
 
     <ItemGroup Condition=" $(TargetFramework.Contains('ios')) OR $(TargetFramework.Contains('catalyst')) ">
         <Compile Include="Platforms\Shared\**\*.cs" />
         <Compile Include="Platforms\ios\**\*.cs" />
         <Compile Include="Platforms\Apple\**\*.cs" />
-        <PackageReference Include="BTProgressHUD" Version="1.5.0" />
+        <PackageReference Include="BTProgressHUD" Version="2.0.1" />
     </ItemGroup>
-
-    <Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
 </Project>

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;
 
 

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

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
 {

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
 {

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

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

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
 {

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
 {

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
 {

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)
             {

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
                 {

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"
   },