Skip to content

Commit 253d398

Browse files
committed
feat: Updated to net10
1 parent f440fcc commit 253d398

File tree

7 files changed

+17
-15
lines changed

7 files changed

+17
-15
lines changed

.github/workflows/dotnet.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- name: Setup .NET
2424
uses: actions/setup-dotnet@v4
2525
with:
26-
dotnet-version: '9.0.x'
26+
dotnet-version: '10.0.x'
2727

2828
- name: Install workloads
2929
run: dotnet workload install maui

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Setup .NET
1919
uses: actions/setup-dotnet@v4
2020
with:
21-
dotnet-version: '9.0.x'
21+
dotnet-version: '10.0.x'
2222

2323
- name: Install workloads
2424
run: dotnet workload install maui

sample/MainViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,6 @@ private async Task AuthenticateAsync(
153153
return;
154154
}
155155

156-
await Application.Current!.Windows[0].Page!.DisplayAlert("Success", "You are authenticated!", "OK");
156+
await Application.Current!.Windows[0].Page!.DisplayAlertAsync("Success", "You are authenticated!", "OK");
157157
}
158158
}

sample/Maui.Biometric.SampleApp.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
5-
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
5+
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
66
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
7-
<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
7+
<!-- <TargetFrameworks>$(TargetFrameworks);net10.0-tizen</TargetFrameworks> -->
88

99
<!-- Note for MacCatalyst:
1010
The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
@@ -19,7 +19,7 @@
1919
<SingleProject>true</SingleProject>
2020
<ImplicitUsings>enable</ImplicitUsings>
2121
<Nullable>enable</Nullable>
22-
<MauiVersion>9.0.90</MauiVersion>
22+
<MauiVersion>10.0.11</MauiVersion>
2323

2424
<!-- Display name -->
2525
<ApplicationTitle>Maui.Biometric.SampleApp</ApplicationTitle>
@@ -64,9 +64,9 @@
6464

6565
<ItemGroup>
6666
<PackageReference Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
67-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.5" />
67+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.1" />
6868
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
69-
<PackageReference Include="CommunityToolkit.Maui" Version="11.2.0" />
69+
<PackageReference Include="CommunityToolkit.Maui" Version="13.0.0" />
7070
</ItemGroup>
7171

7272
<ItemGroup>

src/libs/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</ItemGroup>
3838

3939
<ItemGroup Label="Source Link">
40-
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.25">
40+
<PackageReference Include="DotNet.ReproducibleBuilds" Version="1.2.39">
4141
<PrivateAssets>all</PrivateAssets>
4242
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4343
</PackageReference>

src/libs/Maui.Biometric/Maui.Biometric.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>$(TargetFrameworks);net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.19041.0</TargetFrameworks>
4+
<TargetFrameworks>$(TargetFrameworks);net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst;net10.0-windows10.0.19041.0</TargetFrameworks>
55
<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
6-
<TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks>
6+
<!-- <TargetFrameworks>$(TargetFrameworks);net10.0-tizen</TargetFrameworks>-->
77
<EnableWindowsTargeting>true</EnableWindowsTargeting>
88
<Nullable>enable</Nullable>
99
<LangVersion>preview</LangVersion>
1010
<ImplicitUsings>enable</ImplicitUsings>
1111
<UseMaui>true</UseMaui>
1212
<NoWarn>$(NoWarn);CA1031;CA2000</NoWarn>
13-
<MauiVersion>9.0.90</MauiVersion>
13+
<MauiVersion>10.0.11</MauiVersion>
1414

1515
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">12.2</SupportedOSPlatformVersion>
1616
<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">15.0</SupportedOSPlatformVersion>
@@ -37,7 +37,7 @@
3737
<!-- <PackageReference Include="Xamarin.AndroidX.Activity.Ktx" Version="1.10.1.1" />-->
3838

3939
<!-- AndroidX Biometric -->
40-
<PackageReference Include="Xamarin.AndroidX.Biometric" Version="1.1.0.29" />
40+
<PackageReference Include="Xamarin.AndroidX.Biometric" Version="1.1.0.30" />
4141
</ItemGroup>
4242

4343
<!-- iOS & MacCatalyst -->
@@ -74,7 +74,7 @@
7474
</ItemGroup>
7575
<!-- .NET (generic) -->
7676
<ItemGroup Condition="!($(TargetFramework.StartsWith('net')) == true AND $(TargetFramework.EndsWith('.0')) == true AND $(TargetFramework.Contains('-')) != true)">
77-
<!-- e.g net6.0 or net9.0 (and higher) -->
77+
<!-- e.g net6.0 or net10.0 (and higher) -->
7878
<Compile Remove="**\*.net.cs" />
7979
<None Include="**\*.net.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
8080
<Compile Remove="**\net\**\*.cs" />

src/libs/Maui.Biometric/Platforms/MaciOS/TypeExtensions.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ public static LAPolicy MapToLaPolicy(this Authenticator authenticator)
1414
OperatingSystem.IsMacOSVersionAtLeast(15)))
1515
{
1616
return authenticator.HasFlag(Authenticator.DeviceCredential)
17+
#pragma warning disable CS0618 // Type or member is obsolete
1718
? LAPolicy.DeviceOwnerAuthenticationWithCompanion
1819
: LAPolicy.DeviceOwnerAuthenticationWithBiometricsOrCompanion;
20+
#pragma warning restore CS0618 // Type or member is obsolete
1921
}
2022

2123
return authenticator.HasFlag(Authenticator.DeviceCredential)

0 commit comments

Comments
 (0)