更换 Toolkit Notifications

wherewhere · wherewhere · commit 1c07afd6c643 · 2025-09-07T11:35:47.000+08:00
更新 NuGet 依赖
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -42,6 +42,8 @@ body:
       description: Which Windows versions did you see the issue on?
       options:
         - "Insider Build (xxxxx)"
+        - "Windows 11 version 24H2 (26100, 2024 Update)"
+        - "Windows 11 version 23H2 (22631, November 2023 Update)"
         - "Windows 11 version 22H2 (22621, 2022 Update)"
         - "Windows 11 version 21H2 (22000)"
         - "Windows 10 version 22H2 (19045, 2022 Update)"
diff --git a/WinGetStore/Common/WeakEvent.cs b/WinGetStore/Common/WeakEvent.cs
@@ -45,7 +45,7 @@ public bool Equals(Action<TEventArgs> callback) =>
 
             public static implicit operator Method(Action<TEventArgs> callback) => new(callback);
 
-            public static explicit operator Action<TEventArgs>(Method method) => method.IsDead ? null : method._method.CreateDelegate(typeof(Action<TEventArgs>), method._reference.Target) as Action<TEventArgs>;
+            public static explicit operator Action<TEventArgs>(Method method) => method.IsDead ? null : method._method.CreateDelegate<Action<TEventArgs>>(method._reference.Target);
         }
 
         private readonly List<Method> _list;
diff --git a/WinGetStore/Controls/Flyouts/SettingsFlyoutControl.xaml b/WinGetStore/Controls/Flyouts/SettingsFlyoutControl.xaml
@@ -2,7 +2,7 @@
     x:Class="WinGetStore.Controls.SettingsFlyoutControl"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:clwm="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
+    xmlns:cwuc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:globalization="using:System.Globalization"
     xmlns:helper="using:WinGetStore.Helpers"
@@ -315,14 +315,14 @@
                     </StackPanel>
                 </local:SettingsExpander.ActionContent>
                 <Grid>
-                    <clwm:MarkdownTextBlock
+                    <cwuc:MarkdownTextBlock
                         x:Name="AboutMarkdown"
                         HorizontalAlignment="Left"
                         Text="{x:Bind Provider.AboutTextBlockText, Mode=OneWay}">
-                        <clwm:MarkdownTextBlock.Config>
-                            <clwm:MarkdownConfig />
-                        </clwm:MarkdownTextBlock.Config>
-                    </clwm:MarkdownTextBlock>
+                        <cwuc:MarkdownTextBlock.Config>
+                            <cwuc:MarkdownConfig />
+                        </cwuc:MarkdownTextBlock.Config>
+                    </cwuc:MarkdownTextBlock>
                 </Grid>
             </local:SettingsExpander>
             <muxc:InfoBar
diff --git a/WinGetStore/Helpers/ThemeHelper.cs b/WinGetStore/Helpers/ThemeHelper.cs
@@ -202,7 +202,7 @@ public static bool IsDarkTheme(ElementTheme actualTheme)
                     ? Application.Current.RequestedTheme == ApplicationTheme.Dark
                     : actualTheme == ElementTheme.Dark
                 : actualTheme == ElementTheme.Default
-                    ? UISettings?.GetColorValue(UIColorType.Foreground).IsColorLight() == true
+                    ? UISettings.GetColorValue(UIColorType.Foreground).IsColorLight()
                     : actualTheme == ElementTheme.Dark;
         }
 
diff --git a/WinGetStore/Helpers/TilesHelper.cs b/WinGetStore/Helpers/TilesHelper.cs
@@ -1,6 +1,6 @@
-﻿using Microsoft.Extensions.Logging;
+﻿using CommunityToolkit.Notifications;
+using Microsoft.Extensions.Logging;
 using Microsoft.Management.Deployment;
-using Microsoft.Toolkit.Uwp.Notifications;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/WinGetStore/Pages/SettingsPages/SettingsPage.xaml b/WinGetStore/Pages/SettingsPages/SettingsPage.xaml
@@ -2,8 +2,8 @@
     x:Class="WinGetStore.Pages.SettingsPages.SettingsPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:clwm="using:CommunityToolkit.Labs.WinUI.MarkdownTextBlock"
     xmlns:controls="using:WinGetStore.Controls"
+    xmlns:cwuc="using:CommunityToolkit.WinUI.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:globalization="using:System.Globalization"
     xmlns:helper="using:WinGetStore.Helpers"
@@ -332,14 +332,14 @@
                                 </StackPanel>
                             </controls:SettingsExpander.ActionContent>
                             <Grid>
-                                <clwm:MarkdownTextBlock
+                                <cwuc:MarkdownTextBlock
                                     x:Name="AboutMarkdown"
                                     HorizontalAlignment="Left"
                                     Text="{x:Bind Provider.AboutTextBlockText, Mode=OneWay}">
-                                    <clwm:MarkdownTextBlock.Config>
-                                        <clwm:MarkdownConfig />
-                                    </clwm:MarkdownTextBlock.Config>
-                                </clwm:MarkdownTextBlock>
+                                    <cwuc:MarkdownTextBlock.Config>
+                                        <cwuc:MarkdownConfig />
+                                    </cwuc:MarkdownTextBlock.Config>
+                                </cwuc:MarkdownTextBlock>
                             </Grid>
                         </controls:SettingsExpander>
                         <muxc:InfoBar
diff --git a/WinGetStore/WinGetStore.csproj b/WinGetStore/WinGetStore.csproj
@@ -22,16 +22,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" Version="0.1.250731-build.2197" />
+    <PackageReference Include="CommunityToolkit.Labs.Notifications" Version="0.1.250829-build.2245" />
+    <PackageReference Include="CommunityToolkit.Labs.Uwp.Controls.MarkdownTextBlock" Version="0.1.250829-build.2245" />
     <PackageReference Include="CommunityToolkit.Uwp.Converters" Version="8.2.250402" />
     <PackageReference Include="CommunityToolkit.Uwp.Extensions" Version="8.2.250402" />
     <PackageReference Include="CommunityToolkit.Uwp.Triggers" Version="8.2.250402" />
     <PackageReference Include="Karambolo.Extensions.Logging.File" Version="3.6.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.7" />
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.8" />
     <PackageReference Include="Microsoft.UI.Xaml" Version="2.8.7" />
-    <PackageReference Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.11.430" />
-    <PackageReference Include="System.Drawing.Common" Version="8.0.14" IsImplicitlyDefined="True" />
+    <PackageReference Include="Microsoft.WindowsPackageManager.ComInterop" Version="1.11.460" />
   </ItemGroup>
 
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public bool Equals(Action<TEventArgs> callback) =>`
`45`	`45`
`46`	`46`	`public static implicit operator Method(Action<TEventArgs> callback) => new(callback);`
`47`	`47`
`48`		`- public static explicit operator Action<TEventArgs>(Method method) => method.IsDead ? null : method._method.CreateDelegate(typeof(Action<TEventArgs>), method._reference.Target) as Action<TEventArgs>;`
	`48`	`+ public static explicit operator Action<TEventArgs>(Method method) => method.IsDead ? null : method._method.CreateDelegate<Action<TEventArgs>>(method._reference.Target);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`private readonly List<Method> _list;`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public static bool IsDarkTheme(ElementTheme actualTheme)`
`202`	`202`	`? Application.Current.RequestedTheme == ApplicationTheme.Dark`
`203`	`203`	`: actualTheme == ElementTheme.Dark`
`204`	`204`	`: actualTheme == ElementTheme.Default`
`205`		`- ? UISettings?.GetColorValue(UIColorType.Foreground).IsColorLight() == true`
	`205`	`+ ? UISettings.GetColorValue(UIColorType.Foreground).IsColorLight()`
`206`	`206`	`: actualTheme == ElementTheme.Dark;`
`207`	`207`	`}`
`208`	`208`