Major Changes

Taiizor · Nov 15, 2024 · aa8e9ec · aa8e9ec
1 parent a12a60e
commit aa8e9ec
Show file tree

Hide file tree

Showing 22 changed files with 79 additions and 51 deletions.
diff --git a/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj b/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj
@@ -77,8 +77,8 @@
 
     <ItemGroup>
         <PackageReference Include="SharpCompress" Version="0.38.0" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
         <PackageReference Include="Costura.Fody" Version="6.0.0-beta0000" Condition="$(TargetFramework.StartsWith('net48'))">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>compile; runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj b/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj
@@ -72,8 +72,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
         <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
     </ItemGroup>
 

diff --git a/src/Library/Sucrose.Manager/Sucrose.Manager.csproj b/src/Library/Sucrose.Manager/Sucrose.Manager.csproj
@@ -17,7 +17,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark" Version="3.1.4.8" />
+        <PackageReference Include="Skylark" Version="3.1.4.9" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
 

diff --git a/src/Library/Sucrose.Resources/Sucrose.Resources.csproj b/src/Library/Sucrose.Resources/Sucrose.Resources.csproj
@@ -18,7 +18,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark" Version="3.1.4.8" />
+        <PackageReference Include="Skylark" Version="3.1.4.9" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj b/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj
@@ -73,8 +73,8 @@
 
     <ItemGroup>
         <PackageReference Include="RawInput.Sharp" Version="0.1.3" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj b/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj
@@ -73,8 +73,8 @@
 
     <ItemGroup>
         <PackageReference Include="RawInput.Sharp" Version="0.1.3" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
         <PackageReference Include="CefSharp.Wpf.HwndHost" Version="130.1.90" />
     </ItemGroup>
 

diff --git a/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj b/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj
@@ -72,8 +72,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj b/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj
@@ -72,8 +72,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj b/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj
@@ -72,8 +72,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj b/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj
@@ -73,8 +73,8 @@
 
     <ItemGroup>
         <PackageReference Include="RawInput.Sharp" Version="0.1.3" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
         <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2895-prerelease" />
     </ItemGroup>
 

diff --git a/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj b/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj
@@ -72,8 +72,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj b/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj
@@ -72,7 +72,7 @@
 
     <ItemGroup>
         <PackageReference Include="CsvHelper" Version="33.0.1" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj b/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj
@@ -73,12 +73,12 @@
 
     <ItemGroup>
         <PackageReference Include="WPF-UI" Version="4.0.0-rc.2" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
         <PackageReference Include="XamlFlair.WPF" Version="1.2.13" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
-        <PackageReference Include="Skylark.Clipboard" Version="3.1.4.2" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
+        <PackageReference Include="Skylark.Clipboard" Version="3.1.4.3" />
         <PackageReference Include="WindowsAPICodePackShell" Version="8.0.6" />
-        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview1" />
+        <PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0-preview2" />
         <PackageReference Include="WPF-UI.DependencyInjection" Version="4.0.0-rc.2" />
     </ItemGroup>
 
@@ -89,8 +89,8 @@
         <PackageReference Condition="$(TargetFramework.StartsWith('net6'))" Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
         <PackageReference Condition="$(TargetFramework.StartsWith('net7'))" Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
         <PackageReference Condition="$(TargetFramework.StartsWith('net8'))" Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+        <PackageReference Condition="$(TargetFramework.StartsWith('net9'))" Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
         <PackageReference Condition="$(TargetFramework.StartsWith('net48'))" Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
-        <PackageReference Condition="$(TargetFramework.StartsWith('net9'))" Include="Microsoft.Extensions.Hosting" Version="9.0.0-rtm.24516.5" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj b/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj
@@ -74,10 +74,10 @@
     <ItemGroup>
         <PackageReference Include="NAudio" Version="2.2.1" />
         <PackageReference Include="NPSMLib" Version="0.9.14" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
         <PackageReference Include="MathNet.Numerics" Version="6.0.0-beta1" />
-        <PackageReference Include="LibreHardwareMonitorLib" Version="0.9.4-pre353" />
+        <PackageReference Include="LibreHardwareMonitorLib" Version="0.9.4-pre358" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj b/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj
@@ -73,8 +73,8 @@
 
     <ItemGroup>
         <PackageReference Include="TaskScheduler" Version="2.11.0" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Project/Sucrose.Property/Sucrose.Property.csproj b/src/Project/Sucrose.Property/Sucrose.Property.csproj
@@ -74,8 +74,8 @@
     <ItemGroup>
         <PackageReference Include="WPF-UI" Version="4.0.0-rc.2" />
         <PackageReference Include="HandyControls" Version="3.5.3" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj b/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj
@@ -72,8 +72,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Project/Sucrose.Undo/Sucrose.Undo.csproj b/src/Project/Sucrose.Undo/Sucrose.Undo.csproj
@@ -71,7 +71,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj b/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj
@@ -72,8 +72,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup Condition="$(TargetFramework.StartsWith('net48'))">

diff --git a/src/Shared/Sucrose.Shared.Core/Helper/Framework.cs b/src/Shared/Sucrose.Shared.Core/Helper/Framework.cs
@@ -31,14 +31,29 @@ public static string GetText()
             return $"{Get()}";
         }
 
+        public static string GetText(SSCEFT Type)
+        {
+            return $"{Type}";
+        }
+
         public static string GetName()
         {
             return SSCHA.GetDisplay(Get()).GetName();
         }
 
+        public static string GetName(SSCEFT Type)
+        {
+            return SSCHA.GetDisplay(Type).GetName();
+        }
+
         public static string GetDescription()
         {
             return SSCHA.GetDisplay(Get()).GetDescription();
         }
+
+        public static string GetDescription(SSCEFT Type)
+        {
+            return SSCHA.GetDisplay(Type).GetDescription();
+        }
     }
 }
diff --git a/src/Update/Sucrose.Update/Sucrose.Update.csproj b/src/Update/Sucrose.Update/Sucrose.Update.csproj
@@ -74,8 +74,8 @@
     <ItemGroup>
         <PackageReference Include="WPF-UI" Version="4.0.0-rc.2" />
         <PackageReference Include="SharpCompress" Version="0.38.0" />
-        <PackageReference Include="Skylark.Wing" Version="3.1.7.7" />
-        <PackageReference Include="Skylark.Standard" Version="3.1.6.7" />
+        <PackageReference Include="Skylark.Wing" Version="3.1.7.8" />
+        <PackageReference Include="Skylark.Standard" Version="3.1.6.8" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Update/Sucrose.Update/View/MainWindow.xaml.cs b/src/Update/Sucrose.Update/View/MainWindow.xaml.cs
@@ -25,6 +25,7 @@
 using SMMRU = Sucrose.Memory.Manage.Readonly.Url;
 using SMMU = Sucrose.Manager.Manage.Update;
 using SRER = Sucrose.Resources.Extension.Resources;
+using SSCEFT = Sucrose.Shared.Core.Enum.FrameworkType;
 using SSCEUCT = Sucrose.Shared.Core.Enum.UpdateChannelType;
 using SSCEUET = Sucrose.Shared.Core.Enum.UpdateExtensionType;
 using SSCHA = Sucrose.Shared.Core.Helper.Architecture;
@@ -409,17 +410,7 @@ private bool StepSearching()
                     {
                         string Name = $"{SMMRG.AppName}_{SMMRG.Bundle}_{SSCHF.GetDescription()}_{SSCHA.Get()}_{Latest}{SSCHU.GetDescription(SUMMU.ExtensionType)}";
 
-                        string[] Required =
-                        {
-                            SSCHU.GetDescription(SUMMU.ExtensionType),
-                            SSCHF.GetDescription(),
-                            SSCHA.GetText(),
-                            SMMRG.AppName,
-                            SMMRG.Bundle,
-                            $"{Latest}"
-                        };
-
-                        if (Asset.Name.Contains(Name) && Required.All(Asset.Name.Contains))
+                        if (Asset.Name.Contains(Name))
                         {
                             SUMI.Source = Asset.BrowserDownloadUrl;
 
@@ -434,6 +425,28 @@ private bool StepSearching()
                         }
                     }
 
+                    if (string.IsNullOrEmpty(Bundle))
+                    {
+                        foreach (SSIIA Asset in Assets)
+                        {
+                            string Name = $"{SMMRG.AppName}_{SMMRG.Bundle}_{SSCHF.GetDescription(SSCEFT.NET_Framework_4_8)}_{SSCHA.Get()}_{Latest}{SSCHU.GetDescription(SUMMU.ExtensionType)}";
+
+                            if (Asset.Name.Contains(Name))
+                            {
+                                SUMI.Source = Asset.BrowserDownloadUrl;
+
+                                Bundle = Path.Combine(SUMI.CachePath, Path.GetFileName(SUMI.Source));
+
+                                if (File.Exists(Bundle))
+                                {
+                                    File.Delete(Bundle);
+                                }
+
+                                return true;
+                            }
+                        }
+                    }
+
                     if (string.IsNullOrEmpty(Bundle))
                     {
                         Message.Text = SRER.GetValue("Update", "MessageText", "Searching", "Condition");