Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 51 additions & 51 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,51 +1,51 @@
<Project>
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<!-- Avalonia packages -->
<!-- Important: keep version in sync! -->
<PackageVersion Include="Avalonia" Version="11.3.9" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.9" />
<PackageVersion Include="Avalonia.LinuxFramebuffer" Version="11.3.9" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.9" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.9" />
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.9" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.9" />
<PackageVersion Include="Avalonia.Desktop" Version="11.3.9" />
<PackageVersion Include="Avalonia.iOS" Version="11.3.9" />
<PackageVersion Include="Avalonia.Browser" Version="11.3.9" />
<PackageVersion Include="Avalonia.Android" Version="11.3.9" />
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.9" />
<PackageVersion Include="DesktopNotifications" Version="1.3.1" />
<PackageVersion Include="DesktopNotifications.Avalonia" Version="1.3.1" />
<PackageVersion Include="DesktopNotifications.FreeDesktop" Version="1.3.1" />
<PackageVersion Include="DesktopNotifications.Windows" Version="1.3.1" />
<PackageVersion Include="FastEndpoints" Version="6.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageVersion Include="NAudio" Version="2.2.1" />
<PackageVersion Include="NetCoreAudio" Version="2.0.0" />
<PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.5.1" />
<PackageVersion Include="Serilog" Version="4.3.0" />
<PackageVersion Include="Serilog.Extensions" Version="8.0.3" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.1" />
<PackageVersion Include="Serilog.Sinks.BrowserConsole" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="Splat.Microsoft.Extensions.DependencyInjection" Version="15.3.1" />
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
<PackageVersion Include="SkiaSharp" Version="3.119.1" />
<PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.119.1" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
<PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
<PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="3.119.1" />
</ItemGroup>
</Project>
<Project>
<!-- https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<!-- Avalonia packages -->
<!-- Important: keep version in sync! -->
<PackageVersion Include="Avalonia" Version="11.3.10" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.10" />
<PackageVersion Include="Avalonia.LinuxFramebuffer" Version="11.3.10" />
<PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.10" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.3.10" />
<PackageVersion Include="Avalonia.Fonts.Inter" Version="11.3.10" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.3.10" />
<PackageVersion Include="Avalonia.Desktop" Version="11.3.10" />
<PackageVersion Include="Avalonia.iOS" Version="11.3.10" />
<PackageVersion Include="Avalonia.Browser" Version="11.3.10" />
<PackageVersion Include="Avalonia.Android" Version="11.3.10" />
<PackageVersion Include="DesktopNotifications" Version="1.3.1" />
<PackageVersion Include="DesktopNotifications.Avalonia" Version="1.3.1" />
<PackageVersion Include="DesktopNotifications.FreeDesktop" Version="1.3.1" />
<PackageVersion Include="DesktopNotifications.Windows" Version="1.3.1" />
<PackageVersion Include="FastEndpoints" Version="6.2.0" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.1" />
<PackageVersion Include="NAudio" Version="2.2.1" />
<PackageVersion Include="NetCoreAudio" Version="2.0.0" />
<PackageVersion Include="ReactiveUI.Avalonia" Version="11.3.8" />
<PackageVersion Include="ReactiveUI.SourceGenerators" Version="2.5.1" />
<PackageVersion Include="Serilog" Version="4.3.0" />
<PackageVersion Include="Serilog.Extensions" Version="8.0.3" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
<PackageVersion Include="Serilog.Sinks.BrowserConsole" Version="8.0.0" />
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="Splat.Microsoft.Extensions.DependencyInjection" Version="17.1.1" />
<PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
<PackageVersion Include="SkiaSharp" Version="3.119.1" />
<PackageVersion Include="SkiaSharp.HarfBuzz" Version="3.119.1" />
<PackageVersion Include="SkiaSharp.NativeAssets.Linux" Version="3.119.1" />
<PackageVersion Include="SkiaSharp.NativeAssets.WebAssembly" Version="3.119.1" />
<PackageVersion Include="SkiaSharp.NativeAssets.iOS" Version="3.119.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion src/client/presentation/EasyFocus.Android/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using Android.Content.PM;
using Avalonia;
using Avalonia.Android;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using Microsoft.Extensions.Hosting;
using ReactiveUI;
using Serilog;
Expand Down
2 changes: 1 addition & 1 deletion src/client/presentation/EasyFocus.Browser/Program.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Avalonia;
using Avalonia.Browser;
using Avalonia.ReactiveUI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using ReactiveUI;
using ReactiveUI.Avalonia;
using Serilog;
using Splat;
using Splat.Microsoft.Extensions.DependencyInjection;
Expand Down Expand Up @@ -42,7 +42,7 @@

var resolver = Locator.CurrentMutable;
resolver.InitializeSplat();
resolver.InitializeReactiveUI();

Check warning on line 45 in src/client/presentation/EasyFocus.Browser/Program.cs

View workflow job for this annotation

GitHub Actions / build

Using member 'ReactiveUI.DependencyResolverMixins.InitializeReactiveUI(IMutableDependencyResolver, params RegistrationNamespace[])' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. InitializeReactiveUI uses reflection to locate types which may be trimmed.

Check warning on line 45 in src/client/presentation/EasyFocus.Browser/Program.cs

View workflow job for this annotation

GitHub Actions / build

Using member 'ReactiveUI.DependencyResolverMixins.InitializeReactiveUI(IMutableDependencyResolver, params RegistrationNamespace[])' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. InitializeReactiveUI uses reflection to locate types which may be trimmed.

services
.AddPlatform()
Expand Down
2 changes: 1 addition & 1 deletion src/client/presentation/EasyFocus.Linux/Program.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Avalonia;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using ReactiveUI;
Expand Down
2 changes: 1 addition & 1 deletion src/client/presentation/EasyFocus.Windows/Program.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Avalonia;
using Avalonia.ReactiveUI;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using ReactiveUI;
using ReactiveUI.Avalonia;
using Serilog;
using Splat;
using Splat.Microsoft.Extensions.DependencyInjection;
Expand Down
2 changes: 1 addition & 1 deletion src/client/presentation/EasyFocus.iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Avalonia;
using Avalonia.iOS;
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;
using Foundation;

namespace EasyFocus.iOS;
Expand Down
4 changes: 2 additions & 2 deletions src/client/presentation/EasyFocus/EasyFocus.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,18 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>none</IncludeAssets>
</PackageReference>
<PackageReference Include="Avalonia.ReactiveUI" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="NetCoreAudio" />
<PackageReference Include="ReactiveUI.Avalonia" />
<PackageReference Include="ReactiveUI.SourceGenerators">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Serilog" />
<PackageReference Include="Serilog.Extensions.Logging" />
<PackageReference Include="SkiaSharp" />
<PackageReference Include="SkiaSharp.HarfBuzz" />
<PackageReference Include="SkiaSharp.HarfBuzz" />

</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Input;
using Avalonia.ReactiveUI;
using Avalonia.VisualTree;
using ReactiveUI.Avalonia;

namespace EasyFocus.Features;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using Avalonia.Controls;
using Avalonia.Media;
using Avalonia.ReactiveUI;
using Avalonia.VisualTree;
using EasyFocus.Domain.Entities;
using ReactiveUI;
using ReactiveUI.Avalonia;
using Serilog;
using System;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;

namespace EasyFocus.Features.Pomodoro;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Avalonia.ReactiveUI;
using ReactiveUI;
using ReactiveUI.Avalonia;
using System;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;
using System.Reactive.Linq;

namespace EasyFocus.Features.Settings.Background;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;

namespace EasyFocus.Features.Settings.HomeSettings;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Avalonia.ReactiveUI;
using EasyFocus.Domain.Entities;
using ReactiveUI;
using ReactiveUI.Avalonia;
using Serilog;
using System;
using System.Reactive.Disposables;
using System.Reactive.Disposables.Fluent;

namespace EasyFocus.Features.Settings.Notifications;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Avalonia.ReactiveUI;
using ReactiveUI.Avalonia;

namespace EasyFocus.Features.Settings.Tags;

Expand Down