常规更新依赖 (#223)

Richasy · Jan 10, 2024 · d3e004e · d3e004e
1 parent 0b11c0c
commit d3e004e
Show file tree

Hide file tree

Showing 10 changed files with 164 additions and 154 deletions.
diff --git a/src/App/App.csproj b/src/App/App.csproj
@@ -183,18 +183,18 @@
         <PackageReference Include="CommunityToolkit.Labs.WinUI.SegmentedControl" Version="0.1.230830" />
         <PackageReference Include="CommunityToolkit.Labs.WinUI.SettingsControls" Version="0.0.18" />
         <PackageReference Include="CommunityToolkit.Labs.WinUI.Shimmer" Version="0.1.230830" />
-        <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.231214-build.795" />
+        <PackageReference Include="CommunityToolkit.WinUI.Controls.Sizers" Version="8.0.240109" />
         <PackageReference Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
         <PackageReference Include="CommunityToolkit.WinUI.UI.Controls.Primitives" Version="7.1.2" />
-        <PackageReference Include="H.NotifyIcon.WinUI" Version="2.0.123" />
+        <PackageReference Include="H.NotifyIcon.WinUI" Version="2.0.124" />
         <PackageReference Include="Markdig" Version="0.34.0" />
         <PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
         <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
         <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
+        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
         <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
         <PackageReference Include="NLog" Version="5.2.8" />
         <PackageReference Include="Roman-Numerals" Version="2.0.0" />

diff --git a/src/Libs/Libs.Adapter/Libs.Adapter.csproj b/src/Libs/Libs.Adapter/Libs.Adapter.csproj
@@ -10,7 +10,7 @@
   <ItemGroup>
       <PackageReference Include="Humanizer.Core.zh-CN" Version="2.14.1" />
       <PackageReference Include="Humanizer.Core.zh-Hans" Version="2.14.1" />
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
       <PackageReference Include="Humanizer.Core.zh-Hant" Version="2.14.1" />
   </ItemGroup>

diff --git a/src/Libs/Libs.Flyleaf/Libs.Flyleaf.csproj b/src/Libs/Libs.Flyleaf/Libs.Flyleaf.csproj
@@ -12,10 +12,10 @@
 
   <ItemGroup>
       <PackageReference Include="FFmpeg.AutoGen" Version="5.1.2.3" />
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
       <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="8.0.0" />
-      <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
+      <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
       <PackageReference Include="Vortice.D3DCompiler" Version="3.4.2-beta" />
       <PackageReference Include="Vortice.Direct3D11" Version="3.4.2-beta" />
       <PackageReference Include="Vortice.DirectComposition" Version="3.4.2-beta" />

diff --git a/src/Libs/Libs.Flyleaf/MediaFramework/MediaRenderer/Renderer.PixelShader.cs b/src/Libs/Libs.Flyleaf/MediaFramework/MediaRenderer/Renderer.PixelShader.cs
diff --git a/src/Libs/Libs.Provider/Libs.Provider.csproj b/src/Libs/Libs.Provider/Libs.Provider.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
       <PackageReference Include="HtmlAgilityPack" Version="1.11.57" />
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
       <PackageReference Include="QRCoder" Version="1.4.3" />
   </ItemGroup>

diff --git a/src/Libs/Libs.Toolkit/Libs.Toolkit.csproj b/src/Libs/Libs.Toolkit/Libs.Toolkit.csproj
@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
+        <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
         <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-        <PackageReference Include="System.Drawing.Common" Version="8.0.0" />
+        <PackageReference Include="System.Drawing.Common" Version="8.0.1" />
         <PackageReference Include="ToolGood.Words" Version="3.1.0" />
     </ItemGroup>
 

diff --git a/src/ViewModels/Components/FlyleafPlayerViewModel/FlyleafPlayerViewModel.Properties.cs b/src/ViewModels/Components/FlyleafPlayerViewModel/FlyleafPlayerViewModel.Properties.cs
@@ -51,10 +51,10 @@ public sealed partial class FlyleafPlayerViewModel
     public TimeSpan Duration => Player == null ? TimeSpan.Zero : TimeSpan.FromTicks(((Player)Player).Duration);
 
     /// <inheritdoc/>
-    public double Volume => ((Player)Player).Audio.Volume;
+    public double Volume => Player is Player player ? player.Audio.Volume : 0d;
 
     /// <inheritdoc/>
-    public double PlayRate => ((Player)Player).Speed;
+    public double PlayRate => Player is Player player ? player.Speed : 1d;
 
     /// <inheritdoc/>
     public string LastError => Player == null ? string.Empty : ((Player)Player).LastError;

diff --git a/src/ViewModels/Components/NativePlayerViewModel/NativePlayerViewModel.Properties.cs b/src/ViewModels/Components/NativePlayerViewModel/NativePlayerViewModel.Properties.cs
@@ -50,10 +50,10 @@ public sealed partial class NativePlayerViewModel
     public TimeSpan Duration => Player == null ? TimeSpan.Zero : ((MediaPlayer)Player).NaturalDuration;
 
     /// <inheritdoc/>
-    public double Volume => Player == null ? 100 : ((MediaPlayer)Player).Volume * 100;
+    public double Volume => Player is not MediaPlayer player ? 100 : player.Volume * 100;
 
     /// <inheritdoc/>
-    public double PlayRate => Player == null ? 1 : ((MediaPlayer)Player).PlaybackRate;
+    public double PlayRate => Player is not MediaPlayer player ? 1 : player.PlaybackRate;
 
     /// <inheritdoc/>
     public string LastError { get; private set; }

diff --git a/src/ViewModels/Components/PlayerDetailViewModel/PlayerDetailViewModel.cs b/src/ViewModels/Components/PlayerDetailViewModel/PlayerDetailViewModel.cs
@@ -285,14 +285,15 @@ private void Dispose(bool disposing)
         {
             if (disposing)
             {
-                Clear();
-                Formats.Clear();
-                PlaybackRates.Clear();
                 if (_unitTimer != null)
                 {
                     _unitTimer.Tick -= OnUnitTimerTick;
                     _unitTimer = null;
                 }
+
+                Clear();
+                Formats.Clear();
+                PlaybackRates.Clear();
             }
 
             _disposedValue = true;

diff --git a/src/ViewModels/ViewModels.csproj b/src/ViewModels/ViewModels.csproj
@@ -24,7 +24,7 @@
       <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
       <PackageReference Include="CommunityToolkit.WinUI.UI" Version="7.1.2" />
       <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.0.5.1" />
-      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
+      <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231219000" />
       <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
       <PackageReference Include="NLog" Version="5.2.8" />
       <PackageReference Include="SmartReader" Version="0.9.4" />