Update packages

Grabacr07 · Jun 9, 2024 · 0f8686b · 0f8686b
1 parent bea356d
commit 0f8686b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 359 deletions.
diff --git a/src/MetroTrilithon b/src/MetroTrilithon
diff --git a/src/SilentSelene.sln.DotSettings b/src/SilentSelene.sln.DotSettings
diff --git a/src/SilentSelene/SilentSelene.csproj b/src/SilentSelene/SilentSelene.csproj
@@ -21,14 +21,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GenshinInfo" Version="1.2.3" />
-    <PackageReference Include="JetBrains.Annotations" Version="2023.2.0" />
+    <PackageReference Include="GenshinInfo" Version="1.3.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" />
     <PackageReference Include="LivetCask" Version="4.0.2" />
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.22.0" />
     <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-    <PackageReference Include="ReactiveProperty" Version="9.2.0" />
-    <PackageReference Include="WPF-UI" Version="3.0.0-preview.4" />
+    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.122" />
+    <PackageReference Include="ReactiveProperty" Version="9.5.0" />
+    <PackageReference Include="WPF-UI" Version="3.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SilentSelene/UI/Preferences/Page.Generals.xaml b/src/SilentSelene/UI/Preferences/Page.Generals.xaml
@@ -72,16 +72,16 @@
                                VerticalAlignment="Center" />
                 </DockPanel>
                 <Border Style="{DynamicResource ExpanderContentSeparatorStyle}" />
-                <ui:Hyperlink Content="通知のテスト"
-                              Icon="AlertOn24"
-                              Margin="0,0,0,-4">
+                <ui:HyperlinkButton Content="通知のテスト"
+                                    Icon="AlertOn24"
+                                    Margin="0,0,0,-4">
                     <b:Interaction.Triggers>
                         <b:EventTrigger EventName="Click">
                             <livet:LivetCallMethodAction MethodTarget="{Binding}"
                                                          MethodName="TestNotification" />
                         </b:EventTrigger>
                     </b:Interaction.Triggers>
-                </ui:Hyperlink>
+                </ui:HyperlinkButton>
             </StackPanel>
         </ui:CardExpander>
     </StackPanel>

diff --git a/src/SilentSelene/UI/Preferences/Window.xaml.cs b/src/SilentSelene/UI/Preferences/Window.xaml.cs
@@ -1,5 +1,4 @@
 using System.Windows;
-using Wpf.Ui.Appearance;
 using Wpf.Ui.Controls;
 
 namespace SilentSelene.UI.Preferences;
@@ -9,7 +8,6 @@ partial class Window
     public Window()
     {
         this.InitializeComponent();
-        Watcher.Watch(this);
     }
 
     private void HandleRootNavigationLoaded(object sender, RoutedEventArgs e)

diff --git a/src/SilentSelene/UI/Timer/Window.xaml.cs b/src/SilentSelene/UI/Timer/Window.xaml.cs
@@ -3,7 +3,6 @@
 using System.Windows.Input;
 using MetroTrilithon.UI.Interop;
 using SilentSelene.Properties;
-using Wpf.Ui.Appearance;
 
 namespace SilentSelene.UI.Timer;
 
@@ -17,7 +16,6 @@ public Window()
     protected override void OnSourceInitialized(EventArgs e)
     {
         base.OnSourceInitialized(e);
-        Watcher.Watch(this);
 
         if (UserSettings.Default.WindowPlacement != new Point(0, 0))
         {
+1 −1		.github/workflows/build.yml
+3 −3		src/MetroTrilithon.Desktop/MetroTrilithon.Desktop.csproj
+0 −1		src/MetroTrilithon.Desktop/UI/Controls/NavigationHelper.cs
+1 −1		src/MetroTrilithon.Desktop/UI/Interop/TitleBarSymbolButton.cs
+12 −4		src/MetroTrilithon.sln.DotSettings
+2 −2		src/MetroTrilithon/MetroTrilithon.csproj
+15 −0		src/MetroTrilithon/Utils/DoubleUtil.cs
+15 −0		src/MetroTrilithon/Utils/Int32Util.cs