Revert "update packages"

This reverts commit 7c2ba7c.
anoyetta · Sep 9, 2021 · 9500f79 · 9500f79
1 parent 0bb4993
commit 9500f79
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 107 deletions.
diff --git a/source/RINGS/RINGS.csproj b/source/RINGS/RINGS.csproj
@@ -254,54 +254,54 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Costura.Fody">
-      <Version>5.6.0</Version>
-      <PrivateAssets>all</PrivateAssets>
+      <Version>4.1.0</Version>
     </PackageReference>
     <PackageReference Include="Discord.Net">
-      <Version>2.4.0</Version>
+      <Version>2.2.0</Version>
     </PackageReference>
     <PackageReference Include="Fody">
-      <Version>6.5.2</Version>
+      <Version>6.1.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf">
-      <Version>1.1.0</Version>
+      <Version>1.0.8</Version>
     </PackageReference>
     <PackageReference Include="Hjson">
       <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="MahApps.Metro">
-      <Version>2.4.7</Version>
+      <Version>1.6.5</Version>
     </PackageReference>
     <PackageReference Include="MahApps.Metro.IconPacks">
-      <Version>4.8.0</Version>
+      <Version>4.0.0</Version>
     </PackageReference>
     <PackageReference Include="MaterialDesignColors">
-      <Version>2.0.1</Version>
+      <Version>1.2.4</Version>
     </PackageReference>
     <PackageReference Include="MaterialDesignThemes">
-      <Version>4.1.0</Version>
+      <Version>3.1.1</Version>
     </PackageReference>
     <PackageReference Include="MaterialDesignThemes.MahApps">
-      <Version>0.1.7</Version>
+      <Version>0.1.0</Version>
     </PackageReference>
     <PackageReference Include="MouseKeyHook">
       <Version>5.6.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
+      <Version>12.0.3</Version>
     </PackageReference>
     <PackageReference Include="NLog">
-      <Version>4.7.11</Version>
+      <Version>4.7.0</Version>
     </PackageReference>
     <PackageReference Include="Prism.Wpf">
-      <Version>8.1.97</Version>
+      <Version>7.2.0.1422</Version>
     </PackageReference>
     <PackageReference Include="PropertyChanged.Fody">
-      <Version>3.4.0</Version>
+      <Version>3.2.8</Version>
     </PackageReference>
     <PackageReference Include="Sharlayan">
-      <Version>7.0.1</Version>
+      <Version>5.0.5</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/source/RINGS/Views/ChatLinkSettingsView.xaml b/source/RINGS/Views/ChatLinkSettingsView.xaml
@@ -131,15 +131,15 @@
           HorizontalAlignment="Left"
           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
           Content="Enabled"
-          IsOn="{Binding IsEnabled, Mode=TwoWay}" />
+          IsChecked="{Binding IsEnabled, Mode=TwoWay}" />
 
         <metro:ToggleSwitch
           Margin="0 8 0 0"
           HorizontalAlignment="Left"
           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
           Content="アクティブプロファイルとして固定する"
-          IsOn="{Binding IsFixedActivate, Mode=TwoWay}"
-          OnCommand="{Binding FixedChangeCommand, Mode=OneWay}" />
+          IsChecked="{Binding IsFixedActivate, Mode=TwoWay}"
+          CheckChangedCommand="{Binding FixedChangeCommand, Mode=OneWay}" />
       </StackPanel>
 
       <metro:MetroHeader Header="チャンネルリンク" Margin="0 20 0 0" Grid.Row="1">
@@ -175,7 +175,7 @@
                     VerticalAlignment="Center"
                     Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
                     Content="{Binding ChannelName, Mode=OneWay}"
-                    IsOn="{Binding IsEnabled, Mode=TwoWay}" />
+                    IsChecked="{Binding IsEnabled, Mode=TwoWay}" />
 
                   <ComboBox
                     Grid.Column="1"

diff --git a/source/RINGS/Views/ChatOverlaySettingsEditView.xaml b/source/RINGS/Views/ChatOverlaySettingsEditView.xaml
@@ -48,7 +48,7 @@
   <Grid>
     <TabControl>
       <!-- General Tab -->
-      <TabItem Header="General" Padding="15 0">
+      <TabItem Header="General" Padding="15 0" metro:ControlsHelper.HeaderFontSize="18">
         <ScrollViewer
           Focusable="False"
           IsTabStop="False"
@@ -64,14 +64,14 @@
                   Margin="0 8 0 0"
                   HorizontalAlignment="Left"
                   Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
-                  IsOn="{Binding Model.IsEnabled, Mode=TwoWay}"
+                  IsChecked="{Binding Model.IsEnabled, Mode=TwoWay}"
                   Content="Enabled"
                   ToolTip="オーバーレイはFFXIVまたはRINGSがアクティブのとき表示されます" />
                 <metro:ToggleSwitch
                   Margin="0 8 0 0"
                   HorizontalAlignment="Left"
                   Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
-                  IsOn="{Binding IsDummy, Mode=TwoWay}"
+                  IsChecked="{Binding IsDummy, Mode=TwoWay}"
                   Content="Dummy" />
               </StackPanel>
             </metro:MetroHeader>
@@ -107,7 +107,7 @@
                       Margin="0 8 0 0"
                       HorizontalAlignment="Left"
                       Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
-                      IsOn="{Binding Model.IsLock, Mode=TwoWay}"
+                      IsChecked="{Binding Model.IsLock, Mode=TwoWay}"
                       Content="Lock" />
                   </StackPanel>
                 </metro:MetroHeader>
@@ -144,7 +144,7 @@
                 <metro:MetroHeader Header="フォント" Margin="{DynamicResource ContentMargin}">
                   <StackPanel>
                     <Button
-                      metro:ControlsHelper.ContentCharacterCasing="Normal"
+                      metro:ButtonHelper.PreserveTextCase="True"
                       HorizontalAlignment="Left"
                       HorizontalContentAlignment="Left"
                       Command="{Binding ChangeFontCommand, Mode=OneWay}"
@@ -200,13 +200,13 @@
                       Margin="0 0 0 0"
                       VerticalAlignment="Center"
                       Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
-                      IsOn="{Binding Model.IsShowTimestamp, Mode=TwoWay}"
+                      IsChecked="{Binding Model.IsShowTimestamp, Mode=TwoWay}"
                       Content="発言のタイムスタンプを表示する" />
                     <metro:ToggleSwitch
                       Margin="0 8 0 0"
                       VerticalAlignment="Center"
                       Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
-                      IsOn="{Binding Model.IsAutoHide, Mode=TwoWay}"
+                      IsChecked="{Binding Model.IsAutoHide, Mode=TwoWay}"
                       Content="最後の発言後一定時間で隠す" />
                     <StackPanel
                       Margin="0 8 0 0"
@@ -228,13 +228,13 @@
                       Margin="0 8 0 0"
                       VerticalAlignment="Center"
                       Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
-                      IsOn="{Binding Model.IsAutoActivatePage, Mode=TwoWay}"
+                      IsChecked="{Binding Model.IsAutoActivatePage, Mode=TwoWay}"
                       Content="最後に発言のあったタブをアクティブにする" />
                     <metro:ToggleSwitch
                       Margin="0 8 0 0"
                       VerticalAlignment="Center"
                       Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
-                      IsOn="{Binding Model.IsNotAutoHide, Mode=TwoWay}"
+                      IsChecked="{Binding Model.IsNotAutoHide, Mode=TwoWay}"
                       Content="非アクティブ時に隠さない" />
                   </StackPanel>
                 </metro:MetroHeader>
@@ -247,7 +247,7 @@
       <!-- General Tab end -->
 
       <!-- Tab Pages Tab -->
-      <TabItem Header="Tabs" Padding="15 0">
+      <TabItem Header="Tabs" Padding="15 0" metro:ControlsHelper.HeaderFontSize="18">
         <Grid Margin="10">
           <Grid.ColumnDefinitions>
             <ColumnDefinition Width="Auto" />
@@ -350,7 +350,7 @@
 
             <TabControl Margin="0 10 0 0" Grid.Row="1">
               <!-- Channels -->
-              <TabItem Header="Channels">
+              <TabItem Header="Channels" metro:ControlsHelper.HeaderFontSize="16">
                 <Grid Margin="0 5 0 0">
                   <Grid.RowDefinitions>
                     <RowDefinition />
@@ -375,7 +375,7 @@
                           HorizontalAlignment="Left"
                           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
                           Content="{Binding ChannelName, Mode=OneWay}"
-                          IsOn="{Binding IsEnabled, Mode=TwoWay}" />
+                          IsChecked="{Binding IsEnabled, Mode=TwoWay}" />
                       </DataTemplate>
                     </ItemsControl.ItemTemplate>
                   </ItemsControl>
@@ -385,13 +385,13 @@
                     Margin="0 8 0 0"
                     HorizontalAlignment="Left"
                     Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
-                    IsOn="{Binding IsEnabledAllChannels, Mode=TwoWay}"
+                    IsChecked="{Binding IsEnabledAllChannels, Mode=TwoWay}"
                     Content="ALL" />
                 </Grid>
               </TabItem>
 
               <!-- Ignores -->
-              <TabItem Header="Ignores">
+              <TabItem Header="Ignores" metro:ControlsHelper.HeaderFontSize="16">
                 <ScrollViewer
                   Focusable="False"
                   IsTabStop="False"

diff --git a/source/RINGS/Views/ChatOverlaySettingsView.xaml b/source/RINGS/Views/ChatOverlaySettingsView.xaml
@@ -31,7 +31,7 @@
 
   <Grid>
     <TabControl Focusable="False">
-      <TabItem Header="Overlay" Padding="15 0">
+      <TabItem Header="Overlay" Padding="15 0" metro:ControlsHelper.HeaderFontSize="24">
         <Grid>
           <Grid x:Name="ParentContent">
             <ScrollViewer
@@ -140,7 +140,7 @@
                             Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
                             Margin="0 10 -4 0"
                             Content=""
-                            IsOn="{Binding IsEnabled, Mode=TwoWay}"
+                            IsChecked="{Binding IsEnabled, Mode=TwoWay}"
                             ToolTip="オーバーレイはFFXIVまたはRINGSがアクティブのとき表示されます" />
                         </DockPanel>
                       </Grid>
@@ -175,7 +175,7 @@
       </TabItem>
 
       <!-- Log Colors -->
-      <TabItem Header="Channels" Padding="15 0">
+      <TabItem Header="Channels" Padding="15 0" metro:ControlsHelper.HeaderFontSize="24">
         <ScrollViewer
           Focusable="False"
           IsTabStop="False"
@@ -226,7 +226,7 @@
                         <metro:ToggleSwitch
                           Margin="0 2 -3 0"
                           HorizontalAlignment="Right"
-                          IsOn="{Binding IsEnabledShadow, Mode=TwoWay}"
+                          IsChecked="{Binding IsEnabledShadow, Mode=TwoWay}"
                           Background="{Binding ColorBrush, Mode=OneWay}"
                           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
                           Content="" />
@@ -273,7 +273,7 @@
                         <metro:ToggleSwitch
                           Margin="0 2 -3 0"
                           HorizontalAlignment="Right"
-                          IsOn="{Binding IsTTSEnabled, Mode=TwoWay}"
+                          IsChecked="{Binding IsTTSEnabled, Mode=TwoWay}"
                           Background="{Binding ColorBrush, Mode=OneWay}"
                           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
                           Content="" />
@@ -288,19 +288,19 @@
       </TabItem>
       <!-- Log Colors end -->
       <!-- TTS -->
-      <TabItem Header="TTS" Padding="15 0">
+      <TabItem Header="TTS" Padding="15 0" metro:ControlsHelper.HeaderFontSize="24">
         <StackPanel
           Margin="10">
           <metro:ToggleSwitch
             Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
             HorizontalAlignment="Left"
-            IsOn="{Binding Config.IsTTSEnabled, Mode=TwoWay}"
+            IsChecked="{Binding Config.IsTTSEnabled, Mode=TwoWay}"
             Content="TTSを使用する" />
           <metro:ToggleSwitch
             Margin="0 10 0 0"
             Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
             HorizontalAlignment="Left"
-            IsOn="{Binding Config.IsTTSIgnoreSelf, Mode=TwoWay}"
+            IsChecked="{Binding Config.IsTTSIgnoreSelf, Mode=TwoWay}"
             Content="自分の発言は通知しない" />
 
           <metro:MetroHeader Header="Boyomi サーバー IPアドレス" Margin="0 15 0 0">

diff --git a/source/RINGS/Views/ConfigView.xaml b/source/RINGS/Views/ConfigView.xaml
@@ -73,29 +73,29 @@
           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
           Margin="0 25 0 0"
           HorizontalAlignment="Left"
-          IsOn="{Binding Config.IsStartupWithWindows, Mode=TwoWay}"
+          IsChecked="{Binding Config.IsStartupWithWindows, Mode=TwoWay}"
           Content="Windows のスタート時に起動する" />
 
         <metro:ToggleSwitch
           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
           Margin="{DynamicResource ContentMargin}"
           HorizontalAlignment="Left"
-          IsOn="{Binding Config.IsShutdownWhenMissingFFXIV, Mode=TwoWay}"
+          IsChecked="{Binding Config.IsShutdownWhenMissingFFXIV, Mode=TwoWay}"
           Content="FFXIV が実行されていないとき自動的に終了する"
           ToolTip="FFXIV の終了から10分後に RINGS を自動終了します。" />
 
         <metro:ToggleSwitch
           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
           Margin="{DynamicResource ContentMargin}"
           HorizontalAlignment="Left"
-          IsOn="{Binding Config.IsMinimizeStartup, Mode=TwoWay}"
+          IsChecked="{Binding Config.IsMinimizeStartup, Mode=TwoWay}"
           Content="最小化状態で起動する" />
 
         <metro:ToggleSwitch
           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
           Margin="{DynamicResource ContentMargin}"
           HorizontalAlignment="Left"
-          IsOn="{Binding Config.IsUseBuiltInBrowser, Mode=TwoWay}"
+          IsChecked="{Binding Config.IsUseBuiltInBrowser, Mode=TwoWay}"
           Content="リンクをビルトインブラウザで開く" />
 
         <metro:MetroHeader Header="ビルトインブラウザのサイズ" Margin="{DynamicResource ContentMargin}" Visibility="{Binding Config.IsUseBuiltInBrowser, Mode=OneWay, Converter={StaticResource VisibilityConverter}}">
@@ -162,7 +162,7 @@
           Style="{StaticResource MahApps.Metro.Styles.ToggleSwitch.Win10}"
           Margin="{DynamicResource ContentParagraphMargin}"
           HorizontalAlignment="Left"
-          IsOn="{Binding Config.IsEnabledChatRawLog, Mode=TwoWay}"
+          IsChecked="{Binding Config.IsEnabledChatRawLog, Mode=TwoWay}"
           Content="チャットのデバッグログを有効にする" />
       </StackPanel>
     </ScrollViewer>

diff --git a/source/RINGS/Views/HomeView.xaml b/source/RINGS/Views/HomeView.xaml
@@ -46,7 +46,7 @@
     <GridSplitter Grid.Row="1" Height="1" HorizontalAlignment="Stretch" Background="{DynamicResource GrayBrush10}" Focusable="False" IsTabStop="False" />
 
     <!-- Status -->
-    <metro:MetroHeader Grid.Row="0" Header="Status">
+    <metro:MetroHeader Grid.Row="0" Header="Status" metro:ControlsHelper.HeaderFontSize="20">
       <metro:MetroHeader.Resources>
         <SolidColorBrush x:Key="ActiveIndicatorBrush" Color="{Binding ActiveColor, Mode=OneWay}" />
         <DropShadowEffect
@@ -113,7 +113,7 @@
     </metro:MetroHeader>
 
     <!-- Log -->
-    <metro:MetroHeader Grid.Row="2" Margin="0 5 0 0" Header="Chat Log">
+    <metro:MetroHeader Grid.Row="2" Margin="0 5 0 0" Header="Chat Log" metro:ControlsHelper.HeaderFontSize="20">
       <ScrollViewer
         VirtualizingPanel.IsVirtualizing="True"
         VirtualizingPanel.VirtualizationMode="Recycling"

diff --git a/source/aframe/source/aframe.Core/FodyWeavers.xsd b/source/aframe/source/aframe.Core/FodyWeavers.xsd
@@ -11,16 +11,6 @@
                 <xs:documentation>Used to control if the On_PropertyName_Changed feature is enabled.</xs:documentation>
               </xs:annotation>
             </xs:attribute>
-            <xs:attribute name="TriggerDependentProperties" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Used to control if the Dependent properties feature is enabled.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
-            <xs:attribute name="EnableIsChangedProperty" type="xs:boolean">
-              <xs:annotation>
-                <xs:documentation>Used to control if the IsChanged property feature is enabled.</xs:documentation>
-              </xs:annotation>
-            </xs:attribute>
             <xs:attribute name="EventInvokerNames" type="xs:string">
               <xs:annotation>
                 <xs:documentation>Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form.</xs:documentation>