Skip to content

Commit a0f3a31

Browse files
.NET 10 (#452)
1 parent 519f54e commit a0f3a31

File tree

25 files changed

+77
-77
lines changed

25 files changed

+77
-77
lines changed

.github/workflows/dotnet.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
strategy:
1818
fail-fast: false
1919
matrix:
20-
# os: [windows-latest, macos-15]
20+
# os: [windows-latest, macos-latest]
2121
os: [windows-latest]
2222

2323
steps:
@@ -27,7 +27,7 @@ jobs:
2727
echo "WORKING_DIRECTORY_PATH=C:/Projects/MauiSamples" >> $env:GITHUB_ENV
2828
2929
- name: Prepare variables on macOS
30-
if: ${{ matrix.os == 'macos-15' }}
30+
if: ${{ matrix.os == 'macos-latest' }}
3131
run: |
3232
echo "WORKING_DIRECTORY_PATH=/Users/runner/Projects/MauiSamples" >> $GITHUB_ENV
3333
@@ -38,15 +38,15 @@ jobs:
3838
git checkout ${{ github.head_ref || github.ref_name }}
3939
4040
- name: Setup Xcode
41-
if: ${{ matrix.os == 'macos-15' }}
41+
if: ${{ matrix.os == 'macos-latest' }}
4242
uses: maxim-lobanov/setup-xcode@v1
4343
with:
44-
xcode-version: '16.2'
44+
xcode-version: '26.0'
4545

4646
- name: Setup .NET
4747
uses: actions/setup-dotnet@main
4848
with:
49-
dotnet-version: 9.x
49+
dotnet-version: 10.x
5050

5151
- name: Install dependencies
5252
run: dotnet workload install maui

AndroidBindableLibraries/Balloon/Balloon.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
<ItemGroup>
1111
<!-- Include format is {GroupId}:{ArtifactId} -->
1212
<AndroidMavenLibrary Include="com.github.skydoves:balloon" Version="1.6.12" />
13-
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.9.1.4" />
14-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.5" />
15-
<PackageReference Include="Xamarin.AndroidX.Core.Core.Ktx" Version="1.15.0.2" />
16-
<PackageReference Include="Xamarin.AndroidX.DataBinding.ViewBinding" Version="8.8.2" />
17-
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.8.6" />
18-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" Version="2.8.7.2" />
19-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.2.0" />
13+
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.9.1.5" />
14+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.1.1" />
15+
<PackageReference Include="Xamarin.AndroidX.Core.Core.Ktx" Version="1.17.0" />
16+
<PackageReference Include="Xamarin.AndroidX.DataBinding.ViewBinding" Version="8.13.0" />
17+
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.8.9" />
18+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.Runtime.Ktx" Version="2.9.3" />
19+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.2.20" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<None Update="ReadMe.md">

AndroidBindableLibraries/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Project>
33
<PropertyGroup>
4-
<TargetFramework>net9.0-android</TargetFramework>
4+
<TargetFramework>net10.0-android</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>

AndroidBindableLibraries/MaterialCalendarView/MaterialCalendarView.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@
1212
<AndroidMavenLibrary Include="org.jetbrains.kotlin:kotlin-android-extensions-runtime" Version="1.6.20" Bind="false" />
1313
<AndroidMavenLibrary Include="com.annimon:stream" Version="1.2.2" Bind="false" />
1414
<AndroidMavenLibrary Include="com.applandeo:material-calendar-view" Version="1.9.2" />
15-
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.5" />
16-
<PackageReference Include="Xamarin.AndroidX.Collection" Version="1.4.5.2" />
17-
<PackageReference Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.5.2" />
18-
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.5.2" />
19-
<PackageReference Include="Xamarin.AndroidX.ConstraintLayout" Version="2.2.1" />
20-
<PackageReference Include="Xamarin.AndroidX.Core.Core.Ktx" Version="1.15.0.2" />
21-
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.8.6" />
22-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.0.21.2" />
23-
<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="2.0.21.2" />
15+
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.7.1.1" />
16+
<PackageReference Include="Xamarin.AndroidX.Collection" Version="1.5.0.3" />
17+
<PackageReference Include="Xamarin.AndroidX.Collection.Jvm" Version="1.5.0.3" />
18+
<PackageReference Include="Xamarin.AndroidX.Collection.Ktx" Version="1.5.0.3" />
19+
<PackageReference Include="Xamarin.AndroidX.ConstraintLayout" Version="2.2.1.3" />
20+
<PackageReference Include="Xamarin.AndroidX.Core.Core.Ktx" Version="1.17.0" />
21+
<PackageReference Include="Xamarin.AndroidX.Fragment.Ktx" Version="1.8.9" />
22+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.2.20" />
23+
<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="2.2.20" />
2424
</ItemGroup>
2525
<ItemGroup>
2626
<None Update="ReadMe.md">

AndroidBindableLibraries/RtpLibrary/RtpLibrary.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net9.0-android</TargetFramework>
3+
<TargetFramework>net10.0-android</TargetFramework>
44
<UseMaui>true</UseMaui>
55
<SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
66
<PackageId>VladislavAntonyuk.$(AssemblyName)</PackageId>
@@ -11,12 +11,12 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.8.21.1" />
14-
<PackageReference Include="Xamarin.KotlinX.Coroutines.Android" Version="1.10.2" />
15-
<PackageReference Include="Xamarin.KotlinX.Coroutines.Core" Version="1.10.2" />
16-
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.1.21" />
17-
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.9.1.4" />
18-
<PackageReference Include="Xamarin.KotlinX.Serialization.Core" Version="1.8.1" />
19-
<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.90"/>
14+
<PackageReference Include="Xamarin.KotlinX.Coroutines.Android" Version="1.10.2.1" />
15+
<PackageReference Include="Xamarin.KotlinX.Coroutines.Core" Version="1.10.2.1" />
16+
<PackageReference Include="Xamarin.Kotlin.StdLib" Version="2.2.0.1" />
17+
<PackageReference Include="Xamarin.AndroidX.Annotation" Version="1.9.1.5" />
18+
<PackageReference Include="Xamarin.KotlinX.Serialization.Core" Version="1.9.0.1" />
19+
<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.0-rc.2.25504.7"/>
2020
</ItemGroup>
2121

2222
<ItemGroup>

Database/KanbanBoard/KanbanBoard/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ Article: https://vladislavantonyuk.github.io/articles/Creating-Kanban-Board-usin
77
## Build
88
```pwsh
99
dotnet ef dbcontext optimize -o Models\Optimized -c KanbanBoardDbContext -n KanbanBoard
10-
dotnet build KanbanBoard.csproj -t:Run -f net9.0-android
10+
dotnet build KanbanBoard.csproj -t:Run -f net10.0-android
1111
1212
xcrun simctl list devices
13-
dotnet build KanbanBoard.csproj -t:Run -f net9.0-ios -p:_DeviceName=:v2:udid=XXX
14-
dotnet build KanbanBoard.csproj -t:Run -f net9.0-maccatalyst
15-
dotnet build KanbanBoard.csproj -t:Run -f net9.0-windows10.0.19041.0
13+
dotnet build KanbanBoard.csproj -t:Run -f net10.0-ios -p:_DeviceName=:v2:udid=XXX
14+
dotnet build KanbanBoard.csproj -t:Run -f net10.0-maccatalyst
15+
dotnet build KanbanBoard.csproj -t:Run -f net10.0-windows10.0.19041.0
1616
```
1717

1818
## Images

Database/KanbanBoard/KanbanBoard/README.mdpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ Article: https://vladislavantonyuk.github.io/articles/Creating-Kanban-Board-usin
77
## Build
88
```pwsh
99
dotnet ef dbcontext optimize -o Models\Optimized -c KanbanBoardDbContext -n KanbanBoard
10-
dotnet build KanbanBoard.csproj -t:Run -f net9.0-android
10+
dotnet build KanbanBoard.csproj -t:Run -f net10.0-android
1111

1212
xcrun simctl list devices
13-
dotnet build KanbanBoard.csproj -t:Run -f net9.0-ios -p:_DeviceName=:v2:udid=XXX
14-
dotnet build KanbanBoard.csproj -t:Run -f net9.0-maccatalyst
15-
dotnet build KanbanBoard.csproj -t:Run -f net9.0-windows10.0.19041.0
13+
dotnet build KanbanBoard.csproj -t:Run -f net10.0-ios -p:_DeviceName=:v2:udid=XXX
14+
dotnet build KanbanBoard.csproj -t:Run -f net10.0-maccatalyst
15+
dotnet build KanbanBoard.csproj -t:Run -f net10.0-windows10.0.19041.0
1616
```
1717

1818
## Images

Database/KanbanBoard/KanbanBoardDb/KanbanBoardDb.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net9.0</TargetFrameworks>
4+
<TargetFrameworks>$(NetVersion)</TargetFrameworks>
55

66
<EFOptimizeContext>true</EFOptimizeContext>
77
<EFStartupProject>..\KanbanBoard\KanbanBoard.csproj</EFStartupProject>

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<NetVersion>net9.0</NetVersion>
4+
<NetVersion>net10.0</NetVersion>
55
<LangVersion>preview</LangVersion>
66
</PropertyGroup>
77

Directory.Packages.props

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="AndroidSdk" Version="0.25.0" />
8-
<PackageVersion Include="Appium.WebDriver" Version="8.0.0" />
8+
<PackageVersion Include="Appium.WebDriver" Version="8.0.1" />
99
<PackageVersion Include="AutoFixture" Version="5.0.0-preview0012" />
10-
<PackageVersion Include="BenchmarkDotNet" Version="0.15.2" />
10+
<PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
1111
<PackageVersion Include="Camera.MAUI.ZXing" Version="1.0.0" />
1212
<PackageVersion Include="ClosedXML" Version="0.105.0" />
1313
<PackageVersion Include="CommunityToolkit.Maui" Version="12.1.0" />
@@ -16,28 +16,28 @@
1616
<PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="6.1.1" />
1717
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
1818
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" />
19-
<PackageVersion Include="ConfigCat.Client" Version="9.4.2" />
19+
<PackageVersion Include="ConfigCat.Client" Version="9.4.3" />
2020
<PackageVersion Include="DocumentFormat.OpenXml" Version="3.3.0" />
2121
<PackageVersion Include="InterfaceConverter.SystemTextJson" Version="1.3.2" />
2222
<PackageVersion Include="IronBlock" Version="1.0.18" />
2323
<PackageVersion Include="m3uParser.NET" Version="1.0.17" />
24-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.90" />
24+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="10.0.0-rc.2.25504.7" />
2525
<PackageVersion Include="Microsoft.Azure.NotificationHubs" Version="4.2.0" />
26-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.6" />
27-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.6" />
28-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.6" />
29-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="9.0.6" />
30-
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.7.0" />
31-
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.7.0-preview.1.25356.2" />
32-
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.6" />
26+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.2.25502.107" />
27+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.0-rc.2.25502.107" />
28+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-rc.2.25502.107" />
29+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="10.0.0-rc.2.25502.107" />
30+
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.10.0" />
31+
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.10.0-preview.1.25513.3" />
32+
<PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.0-rc.2.25502.107" />
3333
<PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.23.0" />
34-
<PackageVersion Include="Microsoft.Identity.Client" Version="4.73.1" />
35-
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.90" />
36-
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.90" />
37-
<PackageVersion Include="Microsoft.Maui.Graphics.Text.Markdig" Version="9.0.90" />
38-
<PackageVersion Include="MiniExcel" Version="1.41.3" />
34+
<PackageVersion Include="Microsoft.Identity.Client" Version="4.77.1" />
35+
<PackageVersion Include="Microsoft.Maui.Controls" Version="10.0.0-rc.2.25504.7" />
36+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.0-rc.2.25504.7" />
37+
<PackageVersion Include="Microsoft.Maui.Graphics.Text.Markdig" Version="10.0.0-rc.2.25504.7" />
38+
<PackageVersion Include="MiniExcel" Version="2.0.0-preview.1" />
3939
<PackageVersion Include="M.BindableProperty.Generator" Version="0.11.1" />
40-
<PackageVersion Include="Plugin.BLE" Version="3.2.0-beta.1" />
40+
<PackageVersion Include="Plugin.BLE" Version="3.2.0-beta.2" />
4141
<PackageVersion Include="Plugin.Fingerprint" Version="3.0.0-beta.1" />
4242
<PackageVersion Include="Plugin.Maui.Audio" Version="4.0.0" />
4343
<PackageVersion Include="Refit" Version="8.0.0" />
@@ -50,13 +50,13 @@
5050
<PackageVersion Include="Sve.Blazor.InfiniteScroll" Version="1.0.0-alpha" />
5151
<PackageVersion Include="VisualTestUtils.MagickNet" Version="0.9.46-beta" />
5252
<PackageVersion Include="VladislavAntonyuk.MaterialCalendarView" Version="1.9.2" />
53-
<PackageVersion Include="WindowsAPICodePack" Version="8.0.6" />
53+
<PackageVersion Include="WindowsAPICodePack" Version="8.0.11" />
5454
<PackageVersion Include="Xamarin.Android.ShortcutBadger" Version="1.2.0" />
55-
<PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.5.0.2" />
55+
<PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.5.0.3" />
5656
<PackageVersion Include="Xamarin.Firebase.Messaging" Version="124.1.1.2" />
57-
<PackageVersion Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.12" />
58-
<PackageVersion Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.1.0.6" />
57+
<PackageVersion Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.13" />
58+
<PackageVersion Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.1.0.7" />
5959
<PackageVersion Include="Xamarin.Google.Dagger" Version="2.56.2.2" />
60-
<PackageVersion Include="xunit.v3" Version="3.0.0" />
60+
<PackageVersion Include="xunit.v3" Version="3.1.0" />
6161
</ItemGroup>
6262
</Project>

0 commit comments

Comments
 (0)