Skip to content

Commit dc46bca

Browse files
VladislavAntonyukVladislavAntonyuk
committed
Update dotnet.yml
1 parent 866b786 commit dc46bca

File tree

12 files changed

+40
-149
lines changed

12 files changed

+40
-149
lines changed

‎.github/workflows/dotnet.yml

Lines changed: 6 additions & 7 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-16]
20+
os: [windows-latest, macos-15]
2121

2222
steps:
2323
- name: Prepare variables on Windows
@@ -26,7 +26,7 @@ jobs:
2626
echo "WORKING_DIRECTORY_PATH=C:/Projects/MauiSamples" >> $env:GITHUB_ENV
2727
2828
- name: Prepare variables on macOS
29-
if: ${{ matrix.os == 'macos-16' }}
29+
if: ${{ matrix.os == 'macos-15' }}
3030
run: |
3131
echo "WORKING_DIRECTORY_PATH=/Users/runner/Projects/MauiSamples" >> $GITHUB_ENV
3232
@@ -37,16 +37,15 @@ jobs:
3737
git checkout ${{ github.head_ref || github.ref_name }}
3838
3939
- name: Setup Xcode
40-
if: ${{ matrix.os == 'macos-16' }}
40+
if: ${{ matrix.os == 'macos-15' }}
4141
uses: maxim-lobanov/setup-xcode@v1
4242
with:
43-
xcode-version: '16.0'
43+
xcode-version: '16.2'
4444

4545
- name: Setup .NET
46-
uses: actions/setup-dotnet@v4
46+
uses: actions/setup-dotnet@main
4747
with:
4848
dotnet-version: 9.x
49-
dotnet-quality: 'preview'
5049

5150
- name: Install dependencies
5251
run: dotnet workload install maui
@@ -55,4 +54,4 @@ jobs:
5554
run: |
5655
cd ${{ env.WORKING_DIRECTORY_PATH }}
5756
dotnet restore --configfile NuGet.config
58-
dotnet build -с Release
57+
dotnet build --configuration Release

‎AndroidBindableLibraries/Balloon/Balloon.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
44
<PackageId>VladislavAntonyuk.$(AssemblyName)</PackageId>

‎AndroidBindableLibraries/Directory.Packages.props

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Database/Sqlite/MauiSqlite/MauiSqlite.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
2525
</ItemGroup>
2626

27-
<ItemGroup>
27+
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) =='maccatalyst' ">
2828
<PackageReference Include="SQLitePCLRaw.core" />
2929
<PackageReference Include="SQLitePCLRaw.provider.sqlite3" />
3030
<PackageReference Include="SQLitePCLRaw.bundle_green" />

‎Database/Sqlite/MauiSqliteBlazor/MauiSqliteBlazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
2626
</ItemGroup>
2727

28-
<ItemGroup>
28+
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) =='maccatalyst' ">
2929
<PackageReference Include="SQLitePCLRaw.core" />
3030
<PackageReference Include="SQLitePCLRaw.provider.sqlite3" />
3131
<PackageReference Include="SQLitePCLRaw.bundle_green" />

‎Directory.Packages.props

Lines changed: 23 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,51 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<PackageVersion Include="AndroidSdk" Version="0.18.0" />
8-
<PackageVersion Include="Appium.WebDriver" Version="7.0.0" />
8+
<PackageVersion Include="Appium.WebDriver" Version="7.1.0" />
99
<PackageVersion Include="AutoFixture" Version="5.0.0-preview0011" />
1010
<PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
1111
<PackageVersion Include="Camera.MAUI.ZXing" Version="1.0.0" />
1212
<PackageVersion Include="ClosedXML" Version="0.104.2" />
13-
<PackageVersion Include="CommunityToolkit.Maui" Version="11.0.0" />
14-
<PackageVersion Include="CommunityToolkit.Maui.Camera" Version="2.0.1" />
13+
<PackageVersion Include="CommunityToolkit.Maui" Version="11.1.0" />
14+
<PackageVersion Include="CommunityToolkit.Maui.Camera" Version="2.0.2" />
1515
<PackageVersion Include="CommunityToolkit.Maui.Maps" Version="3.0.1" />
16-
<PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="6.0.0" />
16+
<PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="6.0.1" />
1717
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
1818
<PackageVersion Include="ConfigCat.Client" Version="9.3.2" />
19-
<PackageVersion Include="coverlet.collector" Version="6.0.3" />
2019
<PackageVersion Include="DocumentFormat.OpenXml" Version="3.2.0" />
2120
<PackageVersion Include="InterfaceConverter.SystemTextJson" Version="1.3.2" />
2221
<PackageVersion Include="IronBlock" Version="1.0.18" />
2322
<PackageVersion Include="M.BindableProperty.Generator" Version="0.11.1" />
2423
<PackageVersion Include="m3uParser.NET" Version="1.0.17" />
25-
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.30" />
24+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.40" />
2625
<PackageVersion Include="Microsoft.Azure.NotificationHubs" Version="4.2.0" />
27-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1" />
28-
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.1" />
29-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
30-
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="9.0.1" />
26+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2" />
27+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.2" />
28+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
29+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="9.0.2" />
3130
<PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.1.0-preview.1.25064.3" />
3231
<PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.1.0-preview.1.25064.3" />
33-
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.1" />
32+
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.2" />
3433
<PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
35-
<PackageVersion Include="Microsoft.Identity.Client" Version="4.67.2" />
36-
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.30" />
37-
<PackageVersion Include="Microsoft.Maui.Graphics.Text.Markdig" Version="9.0.30" />
38-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
39-
<PackageVersion Include="MiniExcel" Version="1.36.1" />
34+
<PackageVersion Include="Microsoft.Identity.Client" Version="4.68.0" />
35+
<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.40" />
36+
<PackageVersion Include="Microsoft.Maui.Graphics.Text.Markdig" Version="9.0.40" />
37+
<PackageVersion Include="MiniExcel" Version="1.38.0" />
4038
<PackageVersion Include="Plugin.BLE" Version="3.1.0" />
4139
<PackageVersion Include="Plugin.Fingerprint" Version="3.0.0-beta.1" />
4240
<PackageVersion Include="Plugin.Maui.Audio" Version="3.0.1" />
4341
<PackageVersion Include="Refit" Version="8.0.0" />
4442
<PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
4543
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
46-
<PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
47-
<PackageVersion Include="SQLitePCLRaw.core" Version="2.1.10" />
48-
<PackageVersion Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.10" />
49-
<PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
5044
<PackageVersion Include="Sve.Blazor.InfiniteScroll" Version="1.0.0-alpha" />
5145
<PackageVersion Include="VisualTestUtils.MagickNet" Version="0.9.46-beta" />
5246
<PackageVersion Include="VladislavAntonyuk.Balloon" Version="1.6.4.1" />
53-
<PackageVersion Include="VladislavAntonyuk.MaterialCalendarView" Version="1.9.0.1" />
47+
<PackageVersion Include="xunit.v3" Version="1.1.0" />
48+
5449
<PackageVersion Include="Xamarin.AndroidX.Annotation" Version="1.8.2.1" />
5550
<PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.3" />
5651
<PackageVersion Include="Xamarin.AndroidX.Collection" Version="1.4.3.1" />
5752
<PackageVersion Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.3.1" />
58-
<PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.3.1" />
5953
<PackageVersion Include="Xamarin.AndroidX.ConstraintLayout" Version="2.1.4.10" />
6054
<PackageVersion Include="Xamarin.AndroidX.Core.Core.Ktx" Version="1.13.1.5" />
6155
<PackageVersion Include="Xamarin.AndroidX.DataBinding.ViewBinding" Version="8.4.0" />
@@ -64,27 +58,21 @@
6458
<PackageVersion Include="Xamarin.Kotlin.StdLib" Version="2.0.10.1" />
6559
<PackageVersion Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.9.23" />
6660
<PackageVersion Include="XamPrototype.Android.MavenBinding.Tasks" Version="0.0.11" />
67-
<PackageVersion Include="xunit" Version="2.9.3" />
68-
<PackageVersion Include="xunit.analyzers" Version="1.19.0" />
69-
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
70-
</ItemGroup>
71-
<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) =='maccatalyst' ">
61+
7262
<PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
7363
<PackageVersion Include="SQLitePCLRaw.core" Version="2.1.10" />
7464
<PackageVersion Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.10" />
7565
<PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
76-
</ItemGroup>
77-
<ItemGroup Condition="'$(TargetFramework)' == '$(NetVersion)-android'">
66+
7867
<PackageVersion Include="VladislavAntonyuk.MaterialCalendarView" Version="1.9.0.1" />
7968
<PackageVersion Include="Xamarin.Android.ShortcutBadger" Version="1.2.0" />
80-
<PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.3.1" />
69+
<PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.5.2" />
8170
<PackageVersion Include="Xamarin.Firebase.Messaging" Version="123.1.2.2" />
82-
<PackageVersion Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.4" />
83-
<PackageVersion Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.0.1.3" />
71+
<PackageVersion Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.10" />
72+
<PackageVersion Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.1.0.4" />
8473
<PackageVersion Include="Xamarin.Google.Dagger" Version="2.39.1" />
85-
</ItemGroup>
86-
<ItemGroup Condition="'$(TargetFramework)' == '$(NetVersion)-windows10.0.19041.0'">
74+
8775
<PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" />
8876
<PackageVersion Include="WindowsAPICodePack" Version="8.0.6" />
8977
</ItemGroup>
90-
</Project>
78+
</Project>

‎MauiSamples.slnx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<Solution>
22
<Folder Name="/AndroidBindableLibraries/">
33
<File Path="AndroidBindableLibraries/Directory.Build.props" />
4-
<File Path="AndroidBindableLibraries/Directory.Packages.props" />
54
<Project Path="AndroidBindableLibraries/Balloon/Balloon.csproj" />
65
<Project Path="AndroidBindableLibraries/MaterialCalendarView/MaterialCalendarView.csproj" />
76
<Project Path="AndroidBindableLibraries/Sample/Sample.csproj">
@@ -39,7 +38,6 @@
3938
</Folder>
4039
<Folder Name="/iOSExtensions/">
4140
<File Path="iOSExtensions/Directory.Build.props" />
42-
<File Path="iOSExtensions/Directory.Packages.props" />
4341
</Folder>
4442
<Folder Name="/iOSExtensions/JokeApp/" Id="8d22f23f-89a4-d9d2-f19b-22af86e784bb">
4543
<File Path="iOSExtensions/JokeApp/README.md" />

‎MauiTests/Client.Android.UITests/Client.Android.UITests.csproj

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,11 @@
33
<PropertyGroup>
44
<TargetFrameworks>$(NetVersion)</TargetFrameworks>
55
<RootNamespace>Client.UITests</RootNamespace>
6+
<OutputType>Exe</OutputType>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10-
<PackageReference Include="xunit" />
11-
<PackageReference Include="xunit.analyzers">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="xunit.runner.visualstudio">
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
<PrivateAssets>all</PrivateAssets>
18-
</PackageReference>
19-
<PackageReference Include="coverlet.collector">
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
<PrivateAssets>all</PrivateAssets>
22-
</PackageReference>
10+
<PackageReference Include="xunit.v3" />
2311
</ItemGroup>
2412

2513
<ItemGroup>

‎MauiTests/Client.MacCatalyst.UITests/Client.MacCatalyst.UITests.csproj

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,11 @@
33
<PropertyGroup>
44
<TargetFrameworks>$(NetVersion)</TargetFrameworks>
55
<RootNamespace>Client.UITests</RootNamespace>
6+
<OutputType>Exe</OutputType>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10-
<PackageReference Include="xunit" />
11-
<PackageReference Include="xunit.analyzers">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="xunit.runner.visualstudio">
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
<PrivateAssets>all</PrivateAssets>
18-
</PackageReference>
19-
<PackageReference Include="coverlet.collector">
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
<PrivateAssets>all</PrivateAssets>
22-
</PackageReference>
10+
<PackageReference Include="xunit.v3" />
2311
</ItemGroup>
2412

2513
<ItemGroup>

‎MauiTests/Client.Windows.UITests/Client.Windows.UITests.csproj

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,11 @@
33
<PropertyGroup>
44
<TargetFrameworks>$(NetVersion)</TargetFrameworks>
55
<RootNamespace>Client.UITests</RootNamespace>
6+
<OutputType>Exe</OutputType>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10-
<PackageReference Include="xunit" />
11-
<PackageReference Include="xunit.analyzers">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="xunit.runner.visualstudio">
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
<PrivateAssets>all</PrivateAssets>
18-
</PackageReference>
19-
<PackageReference Include="coverlet.collector">
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
<PrivateAssets>all</PrivateAssets>
22-
</PackageReference>
10+
<PackageReference Include="xunit.v3" />
2311
</ItemGroup>
2412

2513
<ItemGroup>

‎MauiTests/Client.iOS.UITests/Client.iOS.UITests.csproj

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,11 @@
33
<PropertyGroup>
44
<TargetFrameworks>$(NetVersion)</TargetFrameworks>
55
<RootNamespace>Client.UITests</RootNamespace>
6+
<OutputType>Exe</OutputType>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10-
<PackageReference Include="xunit" />
11-
<PackageReference Include="xunit.analyzers">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="xunit.runner.visualstudio">
16-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17-
<PrivateAssets>all</PrivateAssets>
18-
</PackageReference>
19-
<PackageReference Include="coverlet.collector">
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21-
<PrivateAssets>all</PrivateAssets>
22-
</PackageReference>
10+
<PackageReference Include="xunit.v3" />
2311
</ItemGroup>
2412

2513
<ItemGroup>

‎iOSExtensions/Directory.Packages.props

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)