Bump package version, run code cleanup

MDModsDev · Jul 23, 2024 · 60582b1 · 60582b1
1 parent d0fadd1
commit 60582b1
Show file tree

Hide file tree

Showing 68 changed files with 2,975 additions and 3,006 deletions.
diff --git a/Styles/MuseDashModToolsUI.Styles.csproj b/Styles/MuseDashModToolsUI.Styles.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -11,7 +11,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Avalonia" Version="11.0.5"/>
-        <PackageReference Include="Material.Avalonia" Version="3.0.2.42-nightly"/>
+        <PackageReference Include="Avalonia" Version="11.1.0"/>
+        <PackageReference Include="Material.Avalonia" Version="3.6.1-nightly.0.3"/>
     </ItemGroup>
 </Project>
diff --git a/UI.Test/MuseDashModToolsUI.Test.csproj b/UI.Test/MuseDashModToolsUI.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -10,16 +10,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Meziantou.Xunit.ParallelTestFramework" Version="2.1.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0-preview-23531-01"/>
-        <PackageReference Include="Moq" Version="4.20.69"/>
+        <PackageReference Include="Meziantou.Xunit.ParallelTestFramework" Version="2.2.0"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
+        <PackageReference Include="Moq" Version="4.20.70"/>
         <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0"/>
-        <PackageReference Include="xunit" Version="2.6.1"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+        <PackageReference Include="xunit" Version="2.9.0"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/UI/App.axaml b/UI/App.axaml
@@ -9,8 +9,6 @@
     </Application.DataTemplates>
 
     <Application.Styles>
-        <!--This should be removed after https://github.com/AvaloniaCommunity/Material.Avalonia/issues/246 fixed-->
-        <FluentTheme />
         <themes:MaterialTheme BaseTheme="Dark" PrimaryColor="Grey" SecondaryColor="Indigo" />
         <StyleInclude Source="avares://DialogHost.Avalonia/Styles.xaml" />
         <StyleInclude Source="avares://MuseDashModToolsUI.Styles/ModToolsStyles.axaml" />

diff --git a/UI/Bootstrapper.cs b/UI/Bootstrapper.cs
@@ -1,5 +1,4 @@
 using System.IO.Abstractions;
-using System.Net.Http;
 using Autofac;
 using MuseDashModToolsUI.Extensions.MarkupExtensions;
 using MuseDashModToolsUI.ViewModels;

diff --git a/UI/Extensions/StreamReaderExtensions.cs b/UI/Extensions/StreamReaderExtensions.cs
@@ -1,5 +1,3 @@
-using System.IO;
-
 namespace MuseDashModToolsUI.Extensions;
 
 public static class StreamReaderExtensions

diff --git a/UI/Extensions/StringExtensions.cs b/UI/Extensions/StringExtensions.cs
@@ -1,5 +1,4 @@
-using System.IO;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using Avalonia.Media;
 
 namespace MuseDashModToolsUI.Extensions;

diff --git a/UI/Localization/ModDescription/Resources_ModDescription.de.resx b/UI/Localization/ModDescription/Resources_ModDescription.de.resx
@@ -1,178 +1,178 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns="" id="root">
-    <xsd:element name="root" msdata:IsDataSet="true">
+    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns="" id="root">
+        <xsd:element name="root" msdata:IsDataSet="true">
 
         </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>1.3</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+    </xsd:schema>
+    <resheader name="resmimetype">
+        <value>text/microsoft-resx</value>
+    </resheader>
+    <resheader name="version">
+        <value>1.3</value>
+    </resheader>
+    <resheader name="reader">
+        <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
         </value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+    </resheader>
+    <resheader name="writer">
+        <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
         </value>
-  </resheader>
-  <data name="Accuracy Indicator" xml:space="preserve">
+    </resheader>
+    <data name="Accuracy Indicator" xml:space="preserve">
         <value>Adds a more exact accuracy indicator on the bottom of the screen.\nAlso displays average accuracy in milliseconds at the end of the level.</value>
     </data>
-  <data name="AccuracyDisplay" xml:space="preserve">
+    <data name="AccuracyDisplay" xml:space="preserve">
         <value>A live accuracy display for your viewing pleasure.</value>
     </data>
-  <data name="Alt Tab Mute" xml:space="preserve">
+    <data name="Alt Tab Mute" xml:space="preserve">
         <value>Mutes the game when it's not focused.</value>
     </data>
-  <data name="AlwaysAprilFool" xml:space="preserve">
+    <data name="AlwaysAprilFool" xml:space="preserve">
         <value>Boss always shoot pigeon and tutorial is always april fool's, activate good tek hidden</value>
     </data>
-  <data name="AlwaysBadApple" xml:space="preserve">
+    <data name="AlwaysBadApple" xml:space="preserve">
         <value>A mod which changes the background and character etc into black and white in tohou scene</value>
     </data>
-  <data name="AlwaysPigeons" xml:space="preserve">
+    <data name="AlwaysPigeons" xml:space="preserve">
         <value>Boss always shoot pigeon, do not use AlwaysAprilFool at the same time</value>
     </data>
-  <data name="BestCombinationSuggest" xml:space="preserve">
+    <data name="BestCombinationSuggest" xml:space="preserve">
         <value>Displays the best character combination for a level in the pause screen\nThe character combo displayed is usually correct, but don't put your blind faith in it\nWhen in doubt, refer to CharacterScoreboard</value>
     </data>
-  <data name="BPMDisplay" xml:space="preserve">
+    <data name="BPMDisplay" xml:space="preserve">
         <value>A mod which displays the BPM info above level designer on preparation screen</value>
     </data>
-  <data name="CharacterRandomizer" xml:space="preserve">
+    <data name="CharacterRandomizer" xml:space="preserve">
         <value>Everytime you play a chart, a random character combination will be selected</value>
     </data>
-  <data name="CharacterScoreboard" xml:space="preserve">
+    <data name="CharacterScoreboard" xml:space="preserve">
         <value>Displays which character a specific score was achieved with on the leaderboard (OCS)\nIt can also display your own local scores (LCS)</value>
     </data>
-  <data name="ChartDeleter" xml:space="preserve">
+    <data name="ChartDeleter" xml:space="preserve">
         <value>Allows you to queue custom charts to be deleted or moved when you exit the game.</value>
     </data>
-  <data name="ChartReview" xml:space="preserve">
+    <data name="ChartReview" xml:space="preserve">
         <value>Automatically selects sleepwalker, sets offset to 0, sets fever to manual, disables certain UI elements.\nCan be toggled on/off while in-game</value>
     </data>
-  <data name="ChineseMode" xml:space="preserve">
+    <data name="ChineseMode" xml:space="preserve">
         <value>Censores certain aspects of the game (Characters, illustrations, etc)</value>
     </data>
-  <data name="Cinema" xml:space="preserve">
+    <data name="Cinema" xml:space="preserve">
         <value>The mod that allows you to see video backgrounds in custom charts</value>
     </data>
-  <data name="CustomAlbums" xml:space="preserve">
+    <data name="CustomAlbums" xml:space="preserve">
         <value>The mod that allows you to load in custom charts</value>
     </data>
-  <data name="CustomAnchorSupport" xml:space="preserve">
+    <data name="CustomAnchorSupport" xml:space="preserve">
         <value>Allows you to use add the streamer tag in your info.json to mark a song as copyright-free\n(for use with streamer mode)</value>
     </data>
-  <data name="CustomBGBrightness" xml:space="preserve">
+    <data name="CustomBGBrightness" xml:space="preserve">
         <value>Allows you to adjust background brightness lower than 40%</value>
     </data>
-  <data name="CustomHitSound" xml:space="preserve">
+    <data name="CustomHitSound" xml:space="preserve">
         <value>Allows you to make custom hit sound\nDetailed instructions on github readme</value>
     </data>
-  <data name="CustomLoadingScreens" xml:space="preserve">
+    <data name="CustomLoadingScreens" xml:space="preserve">
         <value>Allows you to add custom loading screens (CustomLoadingScreens folder)\nAlso allows you to add custom loading screen messages (UserData/CustomLoadingScreens.cfg)\nMessages can be paired with an image, or be left as random</value>
     </data>
-  <data name="CustomResolution" xml:space="preserve">
+    <data name="CustomResolution" xml:space="preserve">
         <value>Adds a Custom option in resolution settings, which can be changed in the config</value>
     </data>
-  <data name="EffectDisable" xml:space="preserve">
+    <data name="EffectDisable" xml:space="preserve">
         <value>Disables some in-game effects</value>
     </data>
-  <data name="FavGirl" xml:space="preserve">
+    <data name="FavGirl" xml:space="preserve">
         <value>Allows you to favorite characters and elfins\nThis will make you look like that character even if another character is selected.\nYou will have the abilities of the selected character &amp; your plays will be submitted as such</value>
     </data>
-  <data name="FC AP indicator" xml:space="preserve">
+    <data name="FC AP indicator" xml:space="preserve">
         <value>Tells you whether you're on All Perfect/Full Combo pace, and displays the number of misses/greats</value>
     </data>
-  <data name="FeverEffectDisable" xml:space="preserve">
+    <data name="FeverEffectDisable" xml:space="preserve">
         <value>Disables the fever background effect</value>
     </data>
-  <data name="Headquarters" xml:space="preserve">
+    <data name="Headquarters" xml:space="preserve">
         <value>Allows you to submit scores on custom charts obtained from the MDMC website</value>
     </data>
-  <data name="HiddenQoL" xml:space="preserve">
+    <data name="HiddenQoL" xml:space="preserve">
         <value>Adds a button to always show hidden difficulties.\nE.g. you don't need to spam click and such to unlock them before playing</value>
     </data>
-  <data name="IntroSkip" xml:space="preserve">
+    <data name="IntroSkip" xml:space="preserve">
         <value>Skips the "PeroPero HasuHasu" and the opening scene.</value>
     </data>
-  <data name="KeybindManager" xml:space="preserve">
+    <data name="KeybindManager" xml:space="preserve">
         <value>A library for other mods to parse and listen to keybinds</value>
     </data>
-  <data name="LocalizeLib" xml:space="preserve">
+    <data name="LocalizeLib" xml:space="preserve">
         <value>A library for other mods to localize text</value>
     </data>
-  <data name="MDRPC" xml:space="preserve">
+    <data name="MDRPC" xml:space="preserve">
         <value>Muse Dash Rich Presence, which is exactly what it says it is.</value>
     </data>
-  <data name="ModManager" xml:space="preserve">
+    <data name="ModManager" xml:space="preserve">
         <value>Allows you to disable &amp; delete mods while in-game.</value>
     </data>
-  <data name="Muse Dash Mirror" xml:space="preserve">
+    <data name="Muse Dash Mirror" xml:space="preserve">
         <value>A library that makes it easier to access PlayerData, BattleComponents info and create UI elements.\nThis mod does nothing by itself.</value>
     </data>
-  <data name="MuseDashModTools" xml:space="preserve">
+    <data name="MuseDashModTools" xml:space="preserve">
         <value>Automatically detects and logs available mod updates.</value>
     </data>
-  <data name="NoAutoPause" xml:space="preserve">
+    <data name="NoAutoPause" xml:space="preserve">
         <value>Prevents the game from automatically pausing when the game loses focus.</value>
     </data>
-  <data name="NoLevelUpAnimations" xml:space="preserve">
+    <data name="NoLevelUpAnimations" xml:space="preserve">
         <value>Level up animations take ages;\nLet's skip them.</value>
     </data>
-  <data name="PerfectDisable" xml:space="preserve">
+    <data name="PerfectDisable" xml:space="preserve">
         <value>Allows you to disable the judgements in-game.\n(example: show early/late perfects but not pure perfects)\nInspired by ADOFAI Tweaks</value>
     </data>
-  <data name="PopupLib" xml:space="preserve">
+    <data name="PopupLib" xml:space="preserve">
         <value>A library for other mods to manage popups and windows</value>
     </data>
-  <data name="PreventLowAcc" xml:space="preserve">
+    <data name="PreventLowAcc" xml:space="preserve">
         <value>A mod that that allows let's you prevent a score from uploading,\nand still be able to take a screenshot.</value>
     </data>
-  <data name="QuickRestart" xml:space="preserve">
+    <data name="QuickRestart" xml:space="preserve">
         <value>Allows you to use Delete to instantly leave a chart &amp; Allows you to use Backspace to instantly restart a chart\nUpdate now allows you to set custom keybinds.</value>
     </data>
-  <data name="QuickSwitchCombination" xml:space="preserve">
+    <data name="QuickSwitchCombination" xml:space="preserve">
         <value>Allows you to set keybinds to quickly change your characters.\nNow has an in-game menu to add keybinds</value>
     </data>
-  <data name="SceneEggs" xml:space="preserve">
+    <data name="SceneEggs" xml:space="preserve">
         <value>Makes it possible for customs to use certain background decorations that the default charts use.</value>
     </data>
-  <data name="Scoreboard characters and elfins" xml:space="preserve">
+    <data name="Scoreboard characters and elfins" xml:space="preserve">
         <value>Similar to CharacterScoreboard, however, it instead adds icon clickable icon representations,\nwhich automatically switches to the character combo when clicked.</value>
     </data>
-  <data name="ScrollSpeed" xml:space="preserve">
+    <data name="ScrollSpeed" xml:space="preserve">
         <value>Allows charters (not players) to set custom scroll speeds.\nIt's completely up to you whether you wanna use this, most charters don't use it though.</value>
     </data>
-  <data name="SearchPlusPlus" xml:space="preserve">
+    <data name="SearchPlusPlus" xml:space="preserve">
         <value>Displays the title, artist, and difficulty of the song in the top-right corner during play.</value>
     </data>
-  <data name="Song Desc" xml:space="preserve">
+    <data name="Song Desc" xml:space="preserve">
         <value>An extension to SearchPlusPlus, allowing you to create folders\nand search for songs in said folders.</value>
     </data>
-  <data name="Search++ Folder Tag" xml:space="preserve">
+    <data name="Search++ Folder Tag" xml:space="preserve">
         <value>Any search feature you will ever need (probably).\nCheck the homepage or in-game forum for more info.</value>
     </data>
-  <data name="StricterJudge" xml:space="preserve">
+    <data name="StricterJudge" xml:space="preserve">
         <value>A mod which changes the judgement window and make the game harder\nYou can manually change the judgement range in Stricter Judge.cfg</value>
     </data>
-  <data name="True rank for 999+" xml:space="preserve">
+    <data name="True rank for 999+" xml:space="preserve">
         <value>Displays actual ranking instead of "999+" for ranks 1000 to 2000</value>
     </data>
-  <data name="UI Disable" xml:space="preserve">
+    <data name="UI Disable" xml:space="preserve">
         <value>Allows you to disable certain visual aspects of the game (example: hit circles)</value>
     </data>
-  <data name="UltraInstinctSleepwalking" xml:space="preserve">
+    <data name="UltraInstinctSleepwalking" xml:space="preserve">
         <value>Makes Sleepwalker Rin do mashers at max speed instead of the normal slow speed.</value>
     </data>
-  <data name="UnlockAll2" xml:space="preserve">
+    <data name="UnlockAll2" xml:space="preserve">
         <value>An alternative to UnlockAll.\nMaster's stay unlocked only for as long as the mod is installed.</value>
     </data>
-  <data name="VictoryScreenSwitcher" xml:space="preserve">
+    <data name="VictoryScreenSwitcher" xml:space="preserve">
         <value>Allows you to switch victory screen in the settings menu either to DJMAX or Arknights. Swaps original screen with arknights/djmax and vise versa.</value>
     </data>
 </root>