Merge

nulldg · May 23, 2024 · 9ef2239 · 9ef2239
2 parents eb98615 + dc35f25
commit 9ef2239
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 28 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -8,6 +8,7 @@
     <LangVersion>preview</LangVersion>
     <Nullable>enable</Nullable>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <ILLinkTreatWarningsAsErrors>false</ILLinkTreatWarningsAsErrors>
   </PropertyGroup>
 
 </Project>
diff --git a/DiscordChatExporter.Cli.Tests/DiscordChatExporter.Cli.Tests.csproj b/DiscordChatExporter.Cli.Tests/DiscordChatExporter.Cli.Tests.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="xunit" Version="2.8.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.0" PrivateAssets="all" />
   </ItemGroup>

diff --git a/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj b/DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj
@@ -5,17 +5,7 @@
     <AssemblyName>DiscordChatExporterPlus</AssemblyName>
     <ApplicationIcon>..\favicon.ico</ApplicationIcon>
     <PublishTrimmed>true</PublishTrimmed>
-    <JsonSerializerIsReflectionEnabledByDefault>true</JsonSerializerIsReflectionEnabledByDefault>
-    <NoWarn>$(NoWarn);IL2104</NoWarn>
-  </PropertyGroup>
-
-  <!-- Avalonia-related settings -->
-  <PropertyGroup>
     <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
-    <!-- Warnings not valid when using compiled bindings -->
-    <NoWarn>$(NoWarn);IL2026</NoWarn>
-    <!-- Warnings about Material.Avalonia having peer dependencies that we don't use -->
-    <NoWarn>$(NoWarn);IL2035</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -27,7 +17,7 @@
     <PackageReference Include="Avalonia" Version="11.0.10" />
     <PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
     <PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" Condition="'$(Configuration)' == 'Debug'" />
-    <PackageReference Include="Cogwheel" Version="2.0.4" />
+    <PackageReference Include="Cogwheel" Version="2.1.0" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="DialogHost.Avalonia" Version="0.7.7" />
     <PackageReference Include="Gress" Version="2.1.1" />

diff --git a/DiscordChatExporter.Gui/Services/SettingsService.cs b/DiscordChatExporter.Gui/Services/SettingsService.cs
@@ -1,5 +1,6 @@
 using System;
 using System.IO;
+using System.Text.Json.Serialization;
 using Cogwheel;
 using CommunityToolkit.Mvvm.ComponentModel;
 using DiscordChatExporter.Core.Exporting;
@@ -8,54 +9,119 @@
 
 namespace DiscordChatExporter.Gui.Services;
 
+// Can't use [ObservableProperty] here because System.Text.Json's source generator doesn't see
+// the generated properties.
 [INotifyPropertyChanged]
 public partial class SettingsService()
-    : SettingsBase(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Settings.dat"))
+    : SettingsBase(
+        Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Settings.dat"),
+        SerializerContext.Default
+    )
 {
-    [ObservableProperty]
     private ThemeVariant _theme;
+    public ThemeVariant Theme
+    {
+        get => _theme;
+        set => SetProperty(ref _theme, value);
+    }
 
-    [ObservableProperty]
     private bool _isAutoUpdateEnabled = true;
+    public bool IsAutoUpdateEnabled
+    {
+        get => _isAutoUpdateEnabled;
+        set => SetProperty(ref _isAutoUpdateEnabled, value);
+    }
 
-    [ObservableProperty]
     private bool _isTokenPersisted = true;
+    public bool IsTokenPersisted
+    {
+        get => _isTokenPersisted;
+        set => SetProperty(ref _isTokenPersisted, value);
+    }
 
-    [ObservableProperty]
     private ThreadInclusionMode _threadInclusionMode;
+    public ThreadInclusionMode ThreadInclusionMode
+    {
+        get => _threadInclusionMode;
+        set => SetProperty(ref _threadInclusionMode, value);
+    }
 
-    [ObservableProperty]
     private string? _locale;
+    public string? Locale
+    {
+        get => _locale;
+        set => SetProperty(ref _locale, value);
+    }
 
-    [ObservableProperty]
     private bool _isUtcNormalizationEnabled;
+    public bool IsUtcNormalizationEnabled
+    {
+        get => _isUtcNormalizationEnabled;
+        set => SetProperty(ref _isUtcNormalizationEnabled, value);
+    }
 
-    [ObservableProperty]
     private int _parallelLimit = 1;
+    public int ParallelLimit
+    {
+        get => _parallelLimit;
+        set => SetProperty(ref _parallelLimit, value);
+    }
 
-    [ObservableProperty]
     private string? _lastToken;
+    public string? LastToken
+    {
+        get => _lastToken;
+        set => SetProperty(ref _lastToken, value);
+    }
 
-    [ObservableProperty]
     private ExportFormat _lastExportFormat = ExportFormat.HtmlDark;
+    public ExportFormat LastExportFormat
+    {
+        get => _lastExportFormat;
+        set => SetProperty(ref _lastExportFormat, value);
+    }
 
-    [ObservableProperty]
     private string? _lastPartitionLimitValue;
+    public string? LastPartitionLimitValue
+    {
+        get => _lastPartitionLimitValue;
+        set => SetProperty(ref _lastPartitionLimitValue, value);
+    }
 
-    [ObservableProperty]
     private string? _lastMessageFilterValue;
+    public string? LastMessageFilterValue
+    {
+        get => _lastMessageFilterValue;
+        set => SetProperty(ref _lastMessageFilterValue, value);
+    }
 
-    [ObservableProperty]
     private bool _lastShouldFormatMarkdown = true;
+    public bool LastShouldFormatMarkdown
+    {
+        get => _lastShouldFormatMarkdown;
+        set => SetProperty(ref _lastShouldFormatMarkdown, value);
+    }
 
-    [ObservableProperty]
     private bool _lastShouldDownloadAssets;
+    public bool LastShouldDownloadAssets
+    {
+        get => _lastShouldDownloadAssets;
+        set => SetProperty(ref _lastShouldDownloadAssets, value);
+    }
 
-    [ObservableProperty]
     private bool _lastShouldReuseAssets;
+    public bool LastShouldReuseAssets
+    {
+        get => _lastShouldReuseAssets;
+        set => SetProperty(ref _lastShouldReuseAssets, value);
+    }
 
-    [ObservableProperty]
     private string? _lastAssetsDirPath;
+    public string? LastAssetsDirPath
+    {
+        get => _lastAssetsDirPath;
+        set => SetProperty(ref _lastAssetsDirPath, value);
+    }
 
     public override void Save()
     {
@@ -69,3 +135,9 @@ public override void Save()
         LastToken = lastToken;
     }
 }
+
+public partial class SettingsService
+{
+    [JsonSerializable(typeof(SettingsService))]
+    private partial class SerializerContext : JsonSerializerContext;
+}