更新到 WinAppSDK 1.6 (#74)

* update * Fix * Update
Richasy · Sep 24, 2024 · da742d1 · da742d1
1 parent e3c86d4
commit da742d1
Show file tree

Hide file tree

Showing 144 changed files with 948 additions and 686 deletions.
diff --git a/src/App.ruleset b/src/App.ruleset
@@ -89,6 +89,18 @@
   <Rules AnalyzerId="Microsoft.CodeAnalysis.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.NetAnalyzers">
     <Rule Id="CA1416" Action="None" />
   </Rules>
+  <Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers">
+    <Rule Id="VSTHRD100" Action="None" />
+    <Rule Id="VSTHRD101" Action="None" />
+    <Rule Id="VSTHRD200" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Microsoft.VisualStudio.Threading.Analyzers.CSharp" RuleNamespace="Microsoft.VisualStudio.Threading.Analyzers.CSharp">
+    <Rule Id="VSTHRD003" Action="None" />
+    <Rule Id="VSTHRD110" Action="None" />
+  </Rules>
+  <Rules AnalyzerId="Roslynator.CSharp.Analyzers" RuleNamespace="Roslynator.CSharp.Analyzers">
+    <Rule Id="RCS1075" Action="None" />
+  </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA0001" Action="None" />
     <Rule Id="SA1000" Action="None" />

diff --git a/src/Console/RodelAudio.Console/RodelAudio.Console.csproj b/src/Console/RodelAudio.Console/RodelAudio.Console.csproj
@@ -7,11 +7,11 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.8" />
-        <PackageReference Include="Spectre.Console" Version="0.49.1" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.Extensions.Localization" />
+    <PackageReference Include="Spectre.Console" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\Core\RodelAgent.Statics\RodelAgent.Statics.csproj" />

diff --git a/src/Console/RodelChat.Console/RodelChat.Console.csproj b/src/Console/RodelChat.Console/RodelChat.Console.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.8" />
-    <PackageReference Include="Spectre.Console" Version="0.49.1" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.8" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.Extensions.Localization" />
+    <PackageReference Include="Spectre.Console" />
+    <PackageReference Include="System.Drawing.Common" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Console/RodelDraw.Console/RodelDraw.Console.csproj b/src/Console/RodelDraw.Console/RodelDraw.Console.csproj
@@ -7,39 +7,39 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.8" />
-        <PackageReference Include="Spectre.Console" Version="0.49.1" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.Extensions.Localization" />
+    <PackageReference Include="Spectre.Console" />
+  </ItemGroup>
 
-    <ItemGroup>
-        <ProjectReference Include="..\..\Core\RodelAgent.Interfaces\RodelAgent.Interfaces.csproj" />
-        <ProjectReference Include="..\..\Core\RodelAgent.Statics\RodelAgent.Statics.csproj" />
-        <ProjectReference Include="..\..\Core\RodelDraw.Core\RodelDraw.Core.csproj" />
-        <ProjectReference Include="..\..\Core\RodelDraw.Interfaces\RodelDraw.Interfaces.csproj" />
-        <ProjectReference Include="..\..\Core\RodelDraw.Models\RodelDraw.Models.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Core\RodelAgent.Interfaces\RodelAgent.Interfaces.csproj" />
+    <ProjectReference Include="..\..\Core\RodelAgent.Statics\RodelAgent.Statics.csproj" />
+    <ProjectReference Include="..\..\Core\RodelDraw.Core\RodelDraw.Core.csproj" />
+    <ProjectReference Include="..\..\Core\RodelDraw.Interfaces\RodelDraw.Interfaces.csproj" />
+    <ProjectReference Include="..\..\Core\RodelDraw.Models\RodelDraw.Models.csproj" />
+  </ItemGroup>
 
-    <ItemGroup>
-      <Compile Update="Properties\DrawService.Designer.cs">
-        <DesignTime>True</DesignTime>
-        <AutoGen>True</AutoGen>
-        <DependentUpon>DrawService.resx</DependentUpon>
-      </Compile>
-    </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Properties\DrawService.Designer.cs">
+      <DesignTime>True</DesignTime>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>DrawService.resx</DependentUpon>
+    </Compile>
+  </ItemGroup>
 
-    <ItemGroup>
-      <EmbeddedResource Update="Properties\DrawService.resx">
-        <Generator>ResXFileCodeGenerator</Generator>
-        <LastGenOutput>DrawService.Designer.cs</LastGenOutput>
-      </EmbeddedResource>
-    </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Update="Properties\DrawService.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>DrawService.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+  </ItemGroup>
 
-    <ItemGroup>
-      <None Update="config.json">
-        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      </None>
-    </ItemGroup>
+  <ItemGroup>
+    <None Update="config.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 </Project>
diff --git a/src/Console/RodelTranslate.Console/RodelTranslate.Console.csproj b/src/Console/RodelTranslate.Console/RodelTranslate.Console.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.8" />
-    <PackageReference Include="Spectre.Console" Version="0.49.1" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Microsoft.Extensions.Localization" />
+    <PackageReference Include="Spectre.Console" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Core/RodelAgent.Context/RodelAgent.Context.csproj b/src/Core/RodelAgent.Context/RodelAgent.Context.csproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Core/RodelAgent.Models/RodelAgent.Models.csproj b/src/Core/RodelAgent.Models/RodelAgent.Models.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" />
+    <PackageReference Include="System.ComponentModel.Annotations" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 </Project>
diff --git a/src/Core/RodelAgent.Statics/RodelAgent.Statics.csproj b/src/Core/RodelAgent.Statics/RodelAgent.Statics.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Core/RodelAudio.Models/RodelAudio.Models.csproj b/src/Core/RodelAudio.Models/RodelAudio.Models.csproj
@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-        <PackageReference Include="System.Text.Json" Version="8.0.4" />
+        <PackageReference Include="Microsoft.Bcl.HashCode" />
+        <PackageReference Include="System.Text.Json" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Core/RodelChat.Core/RodelChat.Core.csproj b/src/Core/RodelChat.Core/RodelChat.Core.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <NoWarn>SKEXP0110;SKEXP0010;SKEXP0001</NoWarn>
+    <NoWarn>$(NoWarn);SKEXP0110</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Core/RodelChat.Models/RodelChat.Models.csproj b/src/Core/RodelChat.Models/RodelChat.Models.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Core/RodelDraw.Models/RodelDraw.Models.csproj b/src/Core/RodelDraw.Models/RodelDraw.Models.csproj
@@ -7,8 +7,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-        <PackageReference Include="System.Text.Json" Version="8.0.4" />
+        <PackageReference Include="Microsoft.Bcl.HashCode" />
+        <PackageReference Include="System.Text.Json" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Core/RodelTranslate.Core/RodelTranslate.Core.csproj b/src/Core/RodelTranslate.Core/RodelTranslate.Core.csproj
@@ -19,6 +19,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>
 </Project>
diff --git a/src/Core/RodelTranslate.Interfaces/RodelTranslate.Interfaces.csproj b/src/Core/RodelTranslate.Interfaces/RodelTranslate.Interfaces.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Core/RodelTranslate.Models/RodelTranslate.Models.csproj b/src/Core/RodelTranslate.Models/RodelTranslate.Models.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+    <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Desktop/RodelAgent.UI.Models/Constants/SettingNames.cs b/src/Desktop/RodelAgent.UI.Models/Constants/SettingNames.cs
@@ -48,5 +48,6 @@ public enum SettingNames
     IsDrawHistoryColumnManualHide,
     IsAudioHistoryColumnManualHide,
     LastSelectedFeaturePage,
+    IsInternalPromptTest,
 }
 #pragma warning restore CS1591 // 缺少对公共可见类型或成员的 XML 注释
diff --git a/src/Desktop/RodelAgent.UI.ResourceGenerator/RodelAgent.UI.ResourceGenerator.csproj b/src/Desktop/RodelAgent.UI.ResourceGenerator/RodelAgent.UI.ResourceGenerator.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4">
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.10.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" />
   </ItemGroup>
 </Project>
diff --git a/src/Desktop/RodelAgent.UI/App.xaml b/src/Desktop/RodelAgent.UI/App.xaml
@@ -54,6 +54,8 @@
                 </ResourceDictionary>
             </ResourceDictionary.ThemeDictionaries>
 
+            <x:Double x:Key="WindowNarrowMinWidth">850</x:Double>
+
             <converters:BoolToIconVariantConverter x:Key="BoolToIconVariantConverter" />
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
             <converters:BoolToVisibilityConverter x:Key="BoolToVisibilityReverseConverter" IsReverse="True" />

diff --git a/src/Desktop/RodelAgent.UI/App.xaml.cs b/src/Desktop/RodelAgent.UI/App.xaml.cs
@@ -1,5 +1,6 @@
 // Copyright (c) Rodel. All rights reserved.
 
+using System.Web;
 using H.NotifyIcon;
 using Microsoft.UI.Dispatching;
 using Microsoft.Windows.AppLifecycle;
@@ -126,47 +127,60 @@ private void InitializeTrayIcon()
 
     private async Task LaunchWindowAsync(IActivatedEventArgs args = default)
     {
+        var instance = AppInstance.FindOrRegisterForKey(Id);
         if (args is IProtocolActivatedEventArgs protocolArgs
             && !string.IsNullOrEmpty(protocolArgs.Uri.Host))
         {
-            // 处理协议启动.
+            if (protocolArgs.Uri.Host == "internal")
+            {
+                var query = protocolArgs.Uri.Query;
+                var queryItems = HttpUtility.ParseQueryString(query);
+                var feature = queryItems["feature"]?.ToLower() ?? string.Empty;
+                if (!string.IsNullOrEmpty(feature))
+                {
+                    if (feature == "prompt-test")
+                    {
+                        SettingsToolkit.WriteLocalSetting(SettingNames.IsInternalPromptTest, true);
+                    }
+                    else if(feature == "clear")
+                    {
+                        SettingsToolkit.WriteLocalSetting(SettingNames.IsInternalPromptTest, false);
+                    }
+                }
+            }
         }
-        else
+
+        // If the current instance is not the previously registered instance
+        if (!instance.IsCurrent)
         {
-            var instance = AppInstance.FindOrRegisterForKey(Id);
+            var activatedArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
 
-            // If the current instance is not the previously registered instance
-            if (!instance.IsCurrent)
-            {
-                var activatedArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
+            // Redirect to the existing instance
+            await instance.RedirectActivationToAsync(activatedArgs);
 
-                // Redirect to the existing instance
-                await instance.RedirectActivationToAsync(activatedArgs);
+            // Kill the current instance
+            Current.Exit();
+            return;
+        }
 
-                // Kill the current instance
-                Current.Exit();
-                return;
-            }
+        var shouldSkipStartup = SettingsToolkit.ReadLocalSetting(SettingNames.ShouldSkipStartup, false);
+        if (!shouldSkipStartup)
+        {
+            var window = new StartupWindow();
+            window.Activate();
+        }
+        else
+        {
+            _window = new MainWindow();
+            _window.Closed += OnMainWindowClosedAsync;
 
-            var shouldSkipStartup = SettingsToolkit.ReadLocalSetting(SettingNames.ShouldSkipStartup, false);
-            if (!shouldSkipStartup)
+            HandleCloseEvents = SettingsToolkit.ReadLocalSetting(SettingNames.HideWhenCloseWindow, true);
+            if (HandleCloseEvents)
             {
-                var window = new StartupWindow();
-                window.Activate();
+                InitializeTrayIcon();
             }
-            else
-            {
-                _window = new MainWindow();
-                _window.Closed += OnMainWindowClosedAsync;
 
-                HandleCloseEvents = SettingsToolkit.ReadLocalSetting(SettingNames.HideWhenCloseWindow, true);
-                if (HandleCloseEvents)
-                {
-                    InitializeTrayIcon();
-                }
-
-                _window.Activate();
-            }
+            _window.Activate();
         }
     }
 

diff --git a/src/Desktop/RodelAgent.UI/Controls/Audio/AudioHistorySection.xaml b/src/Desktop/RodelAgent.UI/Controls/Audio/AudioHistorySection.xaml
@@ -3,10 +3,10 @@
     x:Class="RodelAgent.UI.Controls.Audio.AudioHistorySection"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:client="using:RodelAudio.Models.Client"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:ext="using:RodelAgent.UI.Extensions"
     xmlns:ic="using:FluentIcons.WinUI"
+    xmlns:items="using:RodelAgent.UI.ViewModels.Items"
     xmlns:local="using:RodelAgent.UI.Controls.Audio"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d">
@@ -63,7 +63,7 @@
             <Grid Margin="0,12,0,20">
                 <ItemsRepeater ItemsSource="{x:Bind ViewModel.History}">
                     <ItemsRepeater.ItemTemplate>
-                        <DataTemplate x:DataType="client:AudioSession">
+                        <DataTemplate x:DataType="items:AudioSessionItemViewModel">
                             <local:AudioSessionItemControl ViewModel="{x:Bind}" />
                         </DataTemplate>
                     </ItemsRepeater.ItemTemplate>