add monthly expedition filter (fixes #519)

ElectronicObserverEN · Dec 17, 2024 · 2bbd240 · 2bbd240
1 parent b37c65a
commit 2bbd240
Show file tree

Hide file tree

Showing 18 changed files with 151 additions and 51 deletions.
diff --git a/Browser/Browser.csproj b/Browser/Browser.csproj
@@ -40,7 +40,7 @@
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="CefSharp.WinForms.NETCore" Version="124.3.50" />
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview2" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
 		<PackageReference Include="Grpc" Version="2.46.6" />
 		<PackageReference Include="Grpc.Core" Version="2.46.6" />
 		<PackageReference Include="Grpc.Core.Api" Version="2.67.0" />

diff --git a/ElectronicObserver.Avalonia.Samples/ElectronicObserver.Avalonia.Samples.csproj b/ElectronicObserver.Avalonia.Samples/ElectronicObserver.Avalonia.Samples.csproj
@@ -23,6 +23,7 @@
 
 	<ItemGroup>
 		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.2.1" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
 		<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="1.1.1" />
 		<PackageReference Include="HotAvalonia.Extensions" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>

diff --git a/ElectronicObserver.Avalonia/ElectronicObserver.Avalonia.csproj b/ElectronicObserver.Avalonia/ElectronicObserver.Avalonia.csproj
@@ -5,6 +5,7 @@
 		<TargetFramework>net8.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
+		<LangVersion>preview</LangVersion>
 		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
 	</PropertyGroup>
 
@@ -28,7 +29,7 @@
 		<PackageReference Include="Avalonia.Desktop" Version="11.2.1" />
 		<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.1" />
 		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.2.0.1" />
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview2" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/ElectronicObserver.Avalonia/ExpeditionCalculator/Expedition.cs b/ElectronicObserver.Avalonia/ExpeditionCalculator/Expedition.cs
@@ -5,6 +5,7 @@ public class Expedition
 	public required int Id { get; init; }
 	public required string DisplayId { get; init; }
 	public required GreatSuccessType GreatSuccessType { get; init; }
+	public required bool IsMonthly { get; init; }
 
 	public required TimeSpan Duration { get; init; }