Skip to content

Commit 35c135e

Browse files
aritchiearitchie
committed
Updating libraries, moving to net8, removing classic xamarin
1 parent b46062e commit 35c135e

16 files changed

+18
-97
lines changed

‎Acr.UserDialogs.sln

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
.github\workflows\build.yml = .github\workflows\build.yml
1111
version.json = version.json
1212
Build.slnf = Build.slnf
13-
global.json = global.json
1413
icon.png = icon.png
1514
readme.md = readme.md
1615
EndProjectSection

‎global.json

-7
This file was deleted.

‎sample/Sample/Sample.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0-android;net6.0-ios;net6.0-maccatalyst</TargetFrameworks>
4+
<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>Sample</RootNamespace>
77
<UseMaui>true</UseMaui>
@@ -33,8 +33,8 @@
3333
<MauiAsset Include="Resources\Raw\**" LogicalName="%(RecursiveDir)%(Filename)%(Extension)" />
3434
</ItemGroup>
3535

36-
3736
<ItemGroup>
38-
<ProjectReference Include="..\..\src\Acr.UserDialogs\Acr.UserDialogs.csproj" />
37+
<PackageReference Include="Microsoft.Maui.Controls" Version="8.0.10" />
38+
<ProjectReference Include="..\..\src\Acr.UserDialogs\Acr.UserDialogs.csproj" />
3939
</ItemGroup>
4040
</Project>

‎src/Acr.UserDialogs/Acr.UserDialogs.csproj

+7-37
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<UseMSBuild Condition="$([MSBuild]::IsOSPlatform('windows'))">true</UseMSBuild>
4-
<MSBuildSdkExtrasVersion>3.0.44</MSBuildSdkExtrasVersion>
5-
</PropertyGroup>
6-
7-
<Import Project="Sdk.props" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
8-
9-
<PropertyGroup>
10-
<TargetFrameworks>net6.0;net6.0-ios;net6.0-android;net6.0-maccatalyst</TargetFrameworks>
11-
<TargetFrameworks Condition="'$(UseMSBuild)' == 'true'">$(TargetFrameworks);netstandard2.0;xamarin.ios10;monoandroid12.0</TargetFrameworks>
3+
<TargetFrameworks>net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
124
<PackageProjectUrl>https://github.com/aritchie/userdialogs</PackageProjectUrl>
135
<Product>$(AssemblyName) ($(TargetFramework))</Product>
146
<Authors>Allan Ritchie</Authors>
@@ -30,53 +22,31 @@
3022
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
3123
<PublishRepositoryUrl>True</PublishRepositoryUrl>
3224
<EmbedUntrackedSources>True</EmbedUntrackedSources>
33-
</PropertyGroup>
34-
35-
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true' OR '$(CI)' == 'true'">
36-
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
37-
</PropertyGroup>
38-
39-
<PropertyGroup Condition=" $(TargetFramework.Contains('android')) ">
40-
<DefineConstants>$(DefineConstants);ANDROIDX</DefineConstants>
25+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true' OR '$(CI)' == 'true'">true</ContinuousIntegrationBuild>
4126
</PropertyGroup>
4227

4328
<ItemGroup>
4429
<None Include="readme.txt" pack="true" PackagePath="." />
4530
<None Include="Platforms\**\*.*" />
4631
<Compile Remove="Platforms\**\*.*" />
47-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
48-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.109">
32+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
33+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133">
4934
<PrivateAssets>all</PrivateAssets>
5035
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
5136
</PackageReference>
5237
</ItemGroup>
5338

54-
<ItemGroup Condition=" $(TargetFramework.StartsWith('Xamarin.iOS')) ">
55-
<Reference Include="OpenTK-1.0" />
56-
<!--<Reference Include="../OpenTK-1.0.dll" />-->
57-
</ItemGroup>
58-
59-
<ItemGroup Condition="$(TargetFramework.Contains('mono'))">
60-
<Reference Include="System.Drawing.Common" />
61-
</ItemGroup>
62-
63-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
64-
<Compile Include="Platforms\Shared\**\*.cs" />
65-
</ItemGroup>
66-
6739
<ItemGroup Condition=" $(TargetFramework.Contains('android')) ">
6840
<Compile Include="Platforms\Shared\**\*.cs" />
6941
<Compile Include="Platforms\Android\**\*.cs" />
70-
<PackageReference Include="AndHUD" Version="1.5.0" />
71-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.0" />
42+
<PackageReference Include="AndHUD" Version="2.0.1" />
43+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />
7244
</ItemGroup>
7345

7446
<ItemGroup Condition=" $(TargetFramework.Contains('ios')) OR $(TargetFramework.Contains('catalyst')) ">
7547
<Compile Include="Platforms\Shared\**\*.cs" />
7648
<Compile Include="Platforms\ios\**\*.cs" />
7749
<Compile Include="Platforms\Apple\**\*.cs" />
78-
<PackageReference Include="BTProgressHUD" Version="1.5.0" />
50+
<PackageReference Include="BTProgressHUD" Version="2.0.1" />
7951
</ItemGroup>
80-
81-
<Import Project="Sdk.targets" Sdk="MSBuild.Sdk.Extras" Version="$(MSBuildSdkExtrasVersion)" Condition="'$(UseMSBuild)' == 'true'" />
8252
</Project>

‎src/Acr.UserDialogs/Platforms/Android/Builders/ActionSheetBuilder.cs

-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
using System;
22
using System.Linq;
33
using Android.App;
4-
#if ANDROIDX
54
using AndroidX.AppCompat.App;
65
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
7-
#else
8-
using Android.Support.V7.App;
9-
using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
10-
#endif
116
using AlertDialog = Android.App.AlertDialog;
127

138

‎src/Acr.UserDialogs/Platforms/Android/Builders/AlertBuilder.cs

-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
using System;
22
using Android.App;
33
using AlertDialog = Android.App.AlertDialog;
4-
#if ANDROIDX
54
using AndroidX.AppCompat.App;
65
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
7-
#else
8-
using Android.Support.V7.App;
9-
using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
10-
#endif
116

127

138
namespace Acr.UserDialogs.Builders

‎src/Acr.UserDialogs/Platforms/Android/Builders/ConfirmBuilder.cs

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
using System;
22
using Android.App;
33
using AlertDialog = Android.App.AlertDialog;
4-
#if ANDROIDX
54
using AndroidX.AppCompat.App;
65
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
7-
#else
8-
using Android.Support.V7.App;
9-
using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
10-
#endif
6+
117

128
namespace Acr.UserDialogs.Builders
139
{

‎src/Acr.UserDialogs/Platforms/Android/Builders/IAlertDialogBuilder.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
using System;
22
using Android.App;
3-
#if ANDROIDX
43
using AndroidX.AppCompat.App;
5-
#else
6-
using Android.Support.V7.App;
7-
#endif
4+
85

96
namespace Acr.UserDialogs.Builders
107
{

‎src/Acr.UserDialogs/Platforms/Android/Builders/LoginBuilder.cs

-5
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,8 @@
44
using Android.Views;
55
using Android.Widget;
66
using AlertDialog = Android.App.AlertDialog;
7-
#if ANDROIDX
87
using AndroidX.AppCompat.App;
98
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
10-
#else
11-
using Android.Support.V7.App;
12-
using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
13-
#endif
149

1510

1611
namespace Acr.UserDialogs.Builders

‎src/Acr.UserDialogs/Platforms/Android/Builders/PromptBuilder.cs

-5
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,8 @@
77
using Android.Views.InputMethods;
88
using Android.Widget;
99
using AlertDialog = Android.App.AlertDialog;
10-
#if ANDROIDX
1110
using AndroidX.AppCompat.App;
1211
using AppCompatAlertDialog = AndroidX.AppCompat.App.AlertDialog;
13-
#else
14-
using Android.Support.V7.App;
15-
using AppCompatAlertDialog = Android.Support.V7.App.AlertDialog;
16-
#endif
1712

1813

1914
namespace Acr.UserDialogs.Builders

‎src/Acr.UserDialogs/Platforms/Android/Fragments/AbstractDialogFragment.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,8 @@
33
using Android.Content;
44
using Android.OS;
55
using Android.Views;
6-
#if ANDROIDX
76
using AndroidX.AppCompat.App;
8-
#else
9-
using Android.Support.V7.App;
10-
#endif
7+
118

129
namespace Acr.UserDialogs.Fragments
1310
{

‎src/Acr.UserDialogs/Platforms/Android/Fragments/BottomSheetDialogFragment.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@
88
using Android.Views;
99
using Android.Widget;
1010
using Orientation = Android.Widget.Orientation;
11-
#if ANDROIDX
1211
using Google.Android.Material.BottomSheet;
13-
#else
14-
using Android.Support.Design.Widget;
15-
#endif
12+
1613

1714
namespace Acr.UserDialogs.Fragments
1815
{

‎src/Acr.UserDialogs/Platforms/Android/Infrastructure/ImageLoader.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@
22
using Android.App;
33
using Android.Graphics.Drawables;
44
using Android.Util;
5-
#if ANDROIDX
65
using AndroidX.Core.Content;
7-
#else
8-
using Android.Support.V4.Content;
9-
#endif
6+
107

118
namespace Acr.UserDialogs.Infrastructure
129
{

‎src/Acr.UserDialogs/Platforms/Android/ProgressDialog.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public virtual void Hide()
7474
this.IsShowing = false;
7575
try
7676
{
77-
AndHUD.Shared.Dismiss(activity);
77+
AndHUD.Shared.Dismiss();
7878
}
7979
catch(Exception exc)
8080
{

‎src/Acr.UserDialogs/Platforms/Android/UserDialogsImpl.cs

+1-6
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,8 @@
88
using Android.Widget;
99
using Android.Text.Style;
1010
using AndroidHUD;
11-
#if ANDROIDX
1211
using AndroidX.AppCompat.App;
1312
using Google.Android.Material.Snackbar;
14-
#else
15-
using Android.Support.V7.App;
16-
using Android.Support.Design.Widget;
17-
#endif
1813

1914

2015
namespace Acr.UserDialogs
@@ -232,7 +227,7 @@ protected virtual IDisposable ToastFallback(Activity activity, ToastConfig cfg)
232227
{
233228
try
234229
{
235-
AndHUD.Shared.Dismiss(activity);
230+
AndHUD.Shared.Dismiss();
236231
}
237232
catch
238233
{

‎version.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "8.1.0-alpha.{height}",
3+
"version": "9.0.0-alpha.{height}",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)