diff --git a/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj b/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj
index 80339f819..708566c4d 100644
--- a/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj
+++ b/src/Bundle/Sucrose.Bundle/Sucrose.Bundle.csproj
@@ -77,8 +77,8 @@
-
-
+
+
all
compile; runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj b/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj
index 27d21833a..7428e74ea 100644
--- a/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj
+++ b/src/Launcher/Sucrose.Launcher/Sucrose.Launcher.csproj
@@ -72,8 +72,8 @@
-
-
+
+
diff --git a/src/Library/Sucrose.Manager/Sucrose.Manager.csproj b/src/Library/Sucrose.Manager/Sucrose.Manager.csproj
index a0b092214..f196f3253 100644
--- a/src/Library/Sucrose.Manager/Sucrose.Manager.csproj
+++ b/src/Library/Sucrose.Manager/Sucrose.Manager.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/src/Library/Sucrose.Resources/Sucrose.Resources.csproj b/src/Library/Sucrose.Resources/Sucrose.Resources.csproj
index c953d59f7..0618a6b69 100644
--- a/src/Library/Sucrose.Resources/Sucrose.Resources.csproj
+++ b/src/Library/Sucrose.Resources/Sucrose.Resources.csproj
@@ -18,7 +18,7 @@
-
+
diff --git a/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj b/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj
index a81ce5ad8..7f9f19983 100644
--- a/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj
+++ b/src/Live/Sucrose.Live.Aurora/Sucrose.Live.Aurora.csproj
@@ -73,8 +73,8 @@
-
-
+
+
diff --git a/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj b/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj
index 9adbd5212..f30d5e34b 100644
--- a/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj
+++ b/src/Live/Sucrose.Live.CefSharp/Sucrose.Live.CefSharp.csproj
@@ -73,8 +73,8 @@
-
-
+
+
diff --git a/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj b/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj
index d6ee947f7..193dfe500 100644
--- a/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj
+++ b/src/Live/Sucrose.Live.MpvPlayer/Sucrose.Live.MpvPlayer.csproj
@@ -72,8 +72,8 @@
-
-
+
+
diff --git a/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj b/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj
index 60e52c10d..db2e854f8 100644
--- a/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj
+++ b/src/Live/Sucrose.Live.Nebula/Sucrose.Live.Nebula.csproj
@@ -72,8 +72,8 @@
-
-
+
+
diff --git a/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj b/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj
index b4f0d8129..8a5f66f73 100644
--- a/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj
+++ b/src/Live/Sucrose.Live.Vexana/Sucrose.Live.Vexana.csproj
@@ -72,8 +72,8 @@
-
-
+
+
diff --git a/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj b/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj
index 42b5c3835..12bbb72ce 100644
--- a/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj
+++ b/src/Live/Sucrose.Live.WebView/Sucrose.Live.WebView.csproj
@@ -73,8 +73,8 @@
-
-
+
+
diff --git a/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj b/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj
index 7419d30c3..754e10513 100644
--- a/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj
+++ b/src/Live/Sucrose.Live.Xavier/Sucrose.Live.Xavier.csproj
@@ -72,8 +72,8 @@
-
-
+
+
diff --git a/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj b/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj
index 8a78cce1c..da7bd74e0 100644
--- a/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj
+++ b/src/Localizer/Sucrose.Localizer/Sucrose.Localizer.csproj
@@ -72,7 +72,7 @@
-
+
diff --git a/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj b/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj
index bff192e3b..9203220f7 100644
--- a/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj
+++ b/src/Portal/Sucrose.Portal/Sucrose.Portal.csproj
@@ -73,12 +73,12 @@
-
+
-
-
+
+
-
+
@@ -89,8 +89,8 @@
+
-
diff --git a/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj b/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj
index 7050ea683..1ffd8f40f 100644
--- a/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj
+++ b/src/Project/Sucrose.Backgroundog/Sucrose.Backgroundog.csproj
@@ -74,10 +74,10 @@
-
-
+
+
-
+
diff --git a/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj b/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj
index 33ba362fa..e0be05e1b 100644
--- a/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj
+++ b/src/Project/Sucrose.Commandog/Sucrose.Commandog.csproj
@@ -73,8 +73,8 @@
-
-
+
+
diff --git a/src/Project/Sucrose.Property/Sucrose.Property.csproj b/src/Project/Sucrose.Property/Sucrose.Property.csproj
index d06e962af..03c59c909 100644
--- a/src/Project/Sucrose.Property/Sucrose.Property.csproj
+++ b/src/Project/Sucrose.Property/Sucrose.Property.csproj
@@ -74,8 +74,8 @@
-
-
+
+
diff --git a/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj b/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj
index dcb0474cf..af12af5aa 100644
--- a/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj
+++ b/src/Project/Sucrose.Reportdog/Sucrose.Reportdog.csproj
@@ -72,8 +72,8 @@
-
-
+
+
diff --git a/src/Project/Sucrose.Undo/Sucrose.Undo.csproj b/src/Project/Sucrose.Undo/Sucrose.Undo.csproj
index e7c41c47c..8f00c9bfd 100644
--- a/src/Project/Sucrose.Undo/Sucrose.Undo.csproj
+++ b/src/Project/Sucrose.Undo/Sucrose.Undo.csproj
@@ -71,7 +71,7 @@
-
+
diff --git a/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj b/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj
index 8bfffa7e1..faafa6dd8 100644
--- a/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj
+++ b/src/Project/Sucrose.Watchdog/Sucrose.Watchdog.csproj
@@ -72,8 +72,8 @@
-
-
+
+
diff --git a/src/Shared/Sucrose.Shared.Core/Helper/Framework.cs b/src/Shared/Sucrose.Shared.Core/Helper/Framework.cs
index d608428fe..0f901cc97 100644
--- 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();
+ }
}
}
\ No newline at end of file
diff --git a/src/Update/Sucrose.Update/Sucrose.Update.csproj b/src/Update/Sucrose.Update/Sucrose.Update.csproj
index 2ff84f6fa..5d81b3bb2 100644
--- a/src/Update/Sucrose.Update/Sucrose.Update.csproj
+++ b/src/Update/Sucrose.Update/Sucrose.Update.csproj
@@ -74,8 +74,8 @@
-
-
+
+
diff --git a/src/Update/Sucrose.Update/View/MainWindow.xaml.cs b/src/Update/Sucrose.Update/View/MainWindow.xaml.cs
index 3bf4e6f11..27bd768e5 100644
--- 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");