Update dotnet.yml

VladislavAntonyuk · Feb 17, 2025 · 98b2fcc · 98b2fcc
1 parent 866b786
commit 98b2fcc
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 146 deletions.
diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
@@ -17,7 +17,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, macos-16]
+        os: [windows-latest, macos-15]
 
     steps:
     - name: Prepare variables on Windows
@@ -26,7 +26,7 @@ jobs:
         echo "WORKING_DIRECTORY_PATH=C:/Projects/MauiSamples" >> $env:GITHUB_ENV
 
     - name: Prepare variables on macOS
-      if: ${{ matrix.os == 'macos-16' }}
+      if: ${{ matrix.os == 'macos-15' }}
       run: |
         echo "WORKING_DIRECTORY_PATH=/Users/runner/Projects/MauiSamples" >> $GITHUB_ENV
 
@@ -37,16 +37,15 @@ jobs:
          git checkout ${{ github.head_ref || github.ref_name }}
 
     - name: Setup Xcode
-      if: ${{ matrix.os == 'macos-16' }}
+      if: ${{ matrix.os == 'macos-15' }}
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '16.0'
+        xcode-version: '16.2'
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@main
       with:
         dotnet-version: 9.x
-        dotnet-quality: 'preview'
 
     - name: Install dependencies
       run: dotnet workload install maui
@@ -55,4 +54,4 @@ jobs:
       run: |
         cd ${{ env.WORKING_DIRECTORY_PATH }}
         dotnet restore --configfile NuGet.config
-        dotnet build -с Release
+        dotnet build --configuration Release
diff --git a/AndroidBindableLibraries/Balloon/Balloon.csproj b/AndroidBindableLibraries/Balloon/Balloon.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
 		<PackageId>VladislavAntonyuk.$(AssemblyName)</PackageId>

diff --git a/AndroidBindableLibraries/Directory.Packages.props b/AndroidBindableLibraries/Directory.Packages.props
diff --git a/Database/Sqlite/MauiSqlite/MauiSqlite.csproj b/Database/Sqlite/MauiSqlite/MauiSqlite.csproj
@@ -24,7 +24,7 @@
 		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
 	</ItemGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) =='maccatalyst' ">
 		<PackageReference Include="SQLitePCLRaw.core" />
 		<PackageReference Include="SQLitePCLRaw.provider.sqlite3" />
 		<PackageReference Include="SQLitePCLRaw.bundle_green" />

diff --git a/Database/Sqlite/MauiSqliteBlazor/MauiSqliteBlazor.csproj b/Database/Sqlite/MauiSqliteBlazor/MauiSqliteBlazor.csproj
@@ -25,7 +25,7 @@
 		<MauiSplashScreen Include="Resources\Splash\splash.svg" Color="#512BD4" BaseSize="128,128" />
 	</ItemGroup>
 
-	<ItemGroup>
+	<ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) =='maccatalyst' ">
 		<PackageReference Include="SQLitePCLRaw.core" />
 		<PackageReference Include="SQLitePCLRaw.provider.sqlite3" />
 		<PackageReference Include="SQLitePCLRaw.bundle_green" />

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -5,57 +5,51 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AndroidSdk" Version="0.18.0" />
-    <PackageVersion Include="Appium.WebDriver" Version="7.0.0" />
+    <PackageVersion Include="Appium.WebDriver" Version="7.1.0" />
     <PackageVersion Include="AutoFixture" Version="5.0.0-preview0011" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="Camera.MAUI.ZXing" Version="1.0.0" />
     <PackageVersion Include="ClosedXML" Version="0.104.2" />
-    <PackageVersion Include="CommunityToolkit.Maui" Version="11.0.0" />
-    <PackageVersion Include="CommunityToolkit.Maui.Camera" Version="2.0.1" />
+    <PackageVersion Include="CommunityToolkit.Maui" Version="11.1.0" />
+    <PackageVersion Include="CommunityToolkit.Maui.Camera" Version="2.0.2" />
     <PackageVersion Include="CommunityToolkit.Maui.Maps" Version="3.0.1" />
-    <PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="6.0.0" />
+    <PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="6.0.1" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
     <PackageVersion Include="ConfigCat.Client" Version="9.3.2" />
-    <PackageVersion Include="coverlet.collector" Version="6.0.3" />
     <PackageVersion Include="DocumentFormat.OpenXml" Version="3.2.0" />
     <PackageVersion Include="InterfaceConverter.SystemTextJson" Version="1.3.2" />
     <PackageVersion Include="IronBlock" Version="1.0.18" />
     <PackageVersion Include="M.BindableProperty.Generator" Version="0.11.1" />
     <PackageVersion Include="m3uParser.NET" Version="1.0.17" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.30" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="9.0.40" />
     <PackageVersion Include="Microsoft.Azure.NotificationHubs" Version="4.2.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.1" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.1" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tasks" Version="9.0.2" />
     <PackageVersion Include="Microsoft.Extensions.AI.Abstractions" Version="9.1.0-preview.1.25064.3" />
     <PackageVersion Include="Microsoft.Extensions.AI.OpenAI" Version="9.1.0-preview.1.25064.3" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.1" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.2" />
     <PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
-    <PackageVersion Include="Microsoft.Identity.Client" Version="4.67.2" />
-    <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.30" />
-    <PackageVersion Include="Microsoft.Maui.Graphics.Text.Markdig" Version="9.0.30" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-    <PackageVersion Include="MiniExcel" Version="1.36.1" />
+    <PackageVersion Include="Microsoft.Identity.Client" Version="4.68.0" />
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.40" />
+    <PackageVersion Include="Microsoft.Maui.Graphics.Text.Markdig" Version="9.0.40" />
+    <PackageVersion Include="MiniExcel" Version="1.38.0" />
     <PackageVersion Include="Plugin.BLE" Version="3.1.0" />
     <PackageVersion Include="Plugin.Fingerprint" Version="3.0.0-beta.1" />
     <PackageVersion Include="Plugin.Maui.Audio" Version="3.0.1" />
     <PackageVersion Include="Refit" Version="8.0.0" />
     <PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
-    <PackageVersion Include="SQLitePCLRaw.core" Version="2.1.10" />
-    <PackageVersion Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.10" />
-    <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
     <PackageVersion Include="Sve.Blazor.InfiniteScroll" Version="1.0.0-alpha" />
     <PackageVersion Include="VisualTestUtils.MagickNet" Version="0.9.46-beta" />
     <PackageVersion Include="VladislavAntonyuk.Balloon" Version="1.6.4.1" />
-    <PackageVersion Include="VladislavAntonyuk.MaterialCalendarView" Version="1.9.0.1" />
+    <PackageVersion Include="xunit.v3" Version="1.1.0" />
+
     <PackageVersion Include="Xamarin.AndroidX.Annotation" Version="1.8.2.1" />
     <PackageVersion Include="Xamarin.AndroidX.AppCompat" Version="1.7.0.3" />
     <PackageVersion Include="Xamarin.AndroidX.Collection" Version="1.4.3.1" />
     <PackageVersion Include="Xamarin.AndroidX.Collection.Jvm" Version="1.4.3.1" />
-    <PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.3.1" />
     <PackageVersion Include="Xamarin.AndroidX.ConstraintLayout" Version="2.1.4.10" />
     <PackageVersion Include="Xamarin.AndroidX.Core.Core.Ktx" Version="1.13.1.5" />
     <PackageVersion Include="Xamarin.AndroidX.DataBinding.ViewBinding" Version="8.4.0" />
@@ -64,27 +58,21 @@
     <PackageVersion Include="Xamarin.Kotlin.StdLib" Version="2.0.10.1" />
     <PackageVersion Include="Xamarin.Kotlin.StdLib.Jdk8" Version="1.9.23" />
     <PackageVersion Include="XamPrototype.Android.MavenBinding.Tasks" Version="0.0.11" />
-    <PackageVersion Include="xunit" Version="2.9.3" />
-    <PackageVersion Include="xunit.analyzers" Version="1.19.0" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="3.0.1" />
-  </ItemGroup>
-  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) =='maccatalyst' ">
+
     <PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
     <PackageVersion Include="SQLitePCLRaw.core" Version="2.1.10" />
     <PackageVersion Include="SQLitePCLRaw.provider.dynamic_cdecl" Version="2.1.10" />
     <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="2.1.10" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == '$(NetVersion)-android'">
+
     <PackageVersion Include="VladislavAntonyuk.MaterialCalendarView" Version="1.9.0.1" />
     <PackageVersion Include="Xamarin.Android.ShortcutBadger" Version="1.2.0" />
-    <PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.3.1" />
+    <PackageVersion Include="Xamarin.AndroidX.Collection.Ktx" Version="1.4.5.2" />
     <PackageVersion Include="Xamarin.Firebase.Messaging" Version="123.1.2.2" />
-    <PackageVersion Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.4" />
-    <PackageVersion Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.0.1.3" />
+    <PackageVersion Include="Xamarin.GooglePlayServices.Code.Scanner" Version="116.1.0.10" />
+    <PackageVersion Include="Xamarin.GooglePlayServices.SafetyNet" Version="118.1.0.4" />
     <PackageVersion Include="Xamarin.Google.Dagger" Version="2.39.1" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == '$(NetVersion)-windows10.0.19041.0'">
+
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" />
     <PackageVersion Include="WindowsAPICodePack" Version="8.0.6" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/MauiTests/Client.Android.UITests/Client.Android.UITests.csproj b/MauiTests/Client.Android.UITests/Client.Android.UITests.csproj
@@ -3,23 +3,11 @@
 	<PropertyGroup>
 		<TargetFrameworks>$(NetVersion)</TargetFrameworks>
 		<RootNamespace>Client.UITests</RootNamespace>
+		<OutputType>Exe</OutputType>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.analyzers">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
+		<PackageReference Include="xunit.v3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/MauiTests/Client.MacCatalyst.UITests/Client.MacCatalyst.UITests.csproj b/MauiTests/Client.MacCatalyst.UITests/Client.MacCatalyst.UITests.csproj
@@ -3,23 +3,11 @@
 	<PropertyGroup>
 		<TargetFrameworks>$(NetVersion)</TargetFrameworks>
 		<RootNamespace>Client.UITests</RootNamespace>
+		<OutputType>Exe</OutputType>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.analyzers">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
+		<PackageReference Include="xunit.v3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/MauiTests/Client.Windows.UITests/Client.Windows.UITests.csproj b/MauiTests/Client.Windows.UITests/Client.Windows.UITests.csproj
@@ -3,23 +3,11 @@
 	<PropertyGroup>
 		<TargetFrameworks>$(NetVersion)</TargetFrameworks>
 		<RootNamespace>Client.UITests</RootNamespace>
+		<OutputType>Exe</OutputType>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.analyzers">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
+		<PackageReference Include="xunit.v3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/MauiTests/Client.iOS.UITests/Client.iOS.UITests.csproj b/MauiTests/Client.iOS.UITests/Client.iOS.UITests.csproj
@@ -3,23 +3,11 @@
 	<PropertyGroup>
 		<TargetFrameworks>$(NetVersion)</TargetFrameworks>
 		<RootNamespace>Client.UITests</RootNamespace>
+		<OutputType>Exe</OutputType>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" />
-		<PackageReference Include="xunit" />
-		<PackageReference Include="xunit.analyzers">
-			<PrivateAssets>all</PrivateAssets>
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-		</PackageReference>
-		<PackageReference Include="xunit.runner.visualstudio">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
-		<PackageReference Include="coverlet.collector">
-			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-			<PrivateAssets>all</PrivateAssets>
-		</PackageReference>
+		<PackageReference Include="xunit.v3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/iOSExtensions/Directory.Packages.props b/iOSExtensions/Directory.Packages.props
@@ -1,12 +1,12 @@
 <Project>
-	<PropertyGroup>
-		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-		<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
-	</PropertyGroup>
-	<ItemGroup>
-		<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
-		<PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.30" />
-		<PackageVersion Include="Refit" Version="8.0.0" />
-		<PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
-	</ItemGroup>
-</Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.40" />
+    <PackageVersion Include="Refit" Version="8.0.0" />
+    <PackageVersion Include="Refit.HttpClientFactory" Version="8.0.0" />
+  </ItemGroup>
+</Project>