From bfbc83eca43b4c81d3eb44ad947d6c08c205bc92 Mon Sep 17 00:00:00 2001 From: Read Stanton Date: Fri, 20 Dec 2024 01:04:49 -0600 Subject: [PATCH] .NET 9 --- .../Engines/Impl/Search/TraceMoeEngine.cs | 2 +- SmartImage.Lib/SmartImage.Lib.csproj | 46 +++++++++---------- SmartImage.Rdx/SmartImage.Rdx.csproj | 38 +++++++-------- SmartImage.UI/MainWindow.xaml.cs | 10 ++-- SmartImage.UI/SmartImage.UI.csproj | 25 +++++----- SmartImage.UI2/Program.cs | 9 +--- SmartImage.UI2/SmartImage.UI2.csproj | 36 +++++++-------- 7 files changed, 83 insertions(+), 83 deletions(-) diff --git a/SmartImage.Lib/Engines/Impl/Search/TraceMoeEngine.cs b/SmartImage.Lib/Engines/Impl/Search/TraceMoeEngine.cs index 39904ef6..3e1c4a40 100644 --- a/SmartImage.Lib/Engines/Impl/Search/TraceMoeEngine.cs +++ b/SmartImage.Lib/Engines/Impl/Search/TraceMoeEngine.cs @@ -220,7 +220,7 @@ public string EpisodeString string epStr = Episode is { } ? Episode is string s ? s : Episode.ToString() : string.Empty; if (Episode is IEnumerable e && e is not string) { - var epList = e.CastToList() + var epList = e.Cast() .Select(x => { var s1 = x.ToString(); diff --git a/SmartImage.Lib/SmartImage.Lib.csproj b/SmartImage.Lib/SmartImage.Lib.csproj index 86cf75bb..bd39b69f 100644 --- a/SmartImage.Lib/SmartImage.Lib.csproj +++ b/SmartImage.Lib/SmartImage.Lib.csproj @@ -1,7 +1,7 @@ - net8.0 + net9.0 SmartImage.Lib enable Debug;Release;Test;UnitTest @@ -42,32 +42,32 @@ - + - + - - + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - + + @@ -76,13 +76,13 @@ ..\..\..\VSProjects\FlareSolverrSharp\src\FlareSolverrSharp\bin\Release\net8.0\FlareSolverrSharp.dll - ..\..\..\VSProjects\Kantan\Kantan\bin\Release\net8.0\Kantan.dll + ..\..\..\VSProjects\Kantan\Kantan\bin\Release\net9.0\Kantan.dll - ..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net8.0\Kantan.Net.dll + ..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net9.0\Kantan.Net.dll - ..\..\..\VSProjects\Novus\Novus\bin\Release\net8.0\Novus.dll + ..\..\..\VSProjects\Novus\Novus\bin\Release\net9.0\Novus.dll diff --git a/SmartImage.Rdx/SmartImage.Rdx.csproj b/SmartImage.Rdx/SmartImage.Rdx.csproj index 6acc4f8a..010747a9 100644 --- a/SmartImage.Rdx/SmartImage.Rdx.csproj +++ b/SmartImage.Rdx/SmartImage.Rdx.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable JETBRAINS_ANNOTATIONS;TRACE @@ -44,25 +44,25 @@ - + - + - - + + - - - - - - - + + + + + + + - + all @@ -70,9 +70,9 @@ - + - + @@ -85,17 +85,17 @@ ..\..\..\VSProjects\FlareSolverrSharp\src\FlareSolverrSharp\bin\Release\net8.0\FlareSolverrSharp.dll - ..\..\..\VSProjects\Kantan\Kantan\bin\Release\net8.0\Kantan.dll + ..\..\..\VSProjects\Kantan\Kantan\bin\Release\net9.0\Kantan.dll - ..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net8.0\Kantan.Net.dll + ..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net9.0\Kantan.Net.dll - ..\..\..\VSProjects\Novus\Novus\bin\Release\net8.0\Novus.dll + ..\..\..\VSProjects\Novus\Novus\bin\Release\net9.0\Novus.dll diff --git a/SmartImage.UI/MainWindow.xaml.cs b/SmartImage.UI/MainWindow.xaml.cs index f8537967..c4ebea10 100644 --- a/SmartImage.UI/MainWindow.xaml.cs +++ b/SmartImage.UI/MainWindow.xaml.cs @@ -59,12 +59,12 @@ using System.Reactive.Linq; using System.Runtime; using System.Runtime.Caching; -using ReactiveUI; +// using ReactiveUI; using Brush = System.Drawing.Brush; using Brushes = System.Windows.Media.Brushes; using System.Buffers; using System.Reflection; -using DynamicData; +// using DynamicData; using SmartImage.Lib.Clients; using SmartImage.UI.Controls; using SmartImage.Lib.Images; @@ -819,7 +819,11 @@ private static IEnumerable Convert(SearchResult result) private void ConvertAddResultItems(SearchResult result) { - CurrentQuery.Results.AddRange(Convert(result)); + var r = Convert(result); + foreach (ResultItem resultItem in r) { + CurrentQuery.Results.Add(resultItem); + + } } #endregion diff --git a/SmartImage.UI/SmartImage.UI.csproj b/SmartImage.UI/SmartImage.UI.csproj index 7aa914bf..9ab21f7e 100644 --- a/SmartImage.UI/SmartImage.UI.csproj +++ b/SmartImage.UI/SmartImage.UI.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows + net9.0-windows enable true JETBRAINS_ANNOTATIONS;TRACE @@ -64,16 +64,17 @@ - + - - - - - - - + + + + + + + + @@ -86,13 +87,13 @@ ..\..\..\VSProjects\FlareSolverrSharp\src\FlareSolverrSharp\bin\Release\net8.0\FlareSolverrSharp.dll - ..\..\..\VSProjects\Kantan\Kantan\bin\Release\net8.0\Kantan.dll + ..\..\..\VSProjects\Kantan\Kantan\bin\Release\net9.0\Kantan.dll - ..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net8.0\Kantan.Net.dll + ..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net9.0\Kantan.Net.dll - ..\..\..\VSProjects\Novus\Novus\bin\Release\net8.0\Novus.dll + ..\..\..\VSProjects\Novus\Novus\bin\Release\net9.0\Novus.dll diff --git a/SmartImage.UI2/Program.cs b/SmartImage.UI2/Program.cs index 9ee8895a..d75d1fb8 100644 --- a/SmartImage.UI2/Program.cs +++ b/SmartImage.UI2/Program.cs @@ -44,8 +44,7 @@ IDisposable PostOnMainLoopAsTimeout() var composite = new CompositeDisposable(2); object timeout = Application.MainLoop.AddTimeout( - dueTime, - () => + dueTime, (cb) => { composite.Add(action(this, state)); @@ -64,12 +63,8 @@ IDisposable PostOnMainLoopAsTimeout() } - public class Item1 - { - - + public class Item1 { } - } public static void Main(string[] args) { Application.Init(); diff --git a/SmartImage.UI2/SmartImage.UI2.csproj b/SmartImage.UI2/SmartImage.UI2.csproj index 13379476..730d8c3a 100644 --- a/SmartImage.UI2/SmartImage.UI2.csproj +++ b/SmartImage.UI2/SmartImage.UI2.csproj @@ -2,32 +2,32 @@ Exe - net8.0 + net9.0 enable enable - - + + - + - - - - - - - - - - + + + + + + + + + + - + @@ -36,13 +36,13 @@ - ..\..\..\VSProjects\Kantan\Kantan\bin\Release\net8.0\Kantan.dll + ..\..\..\VSProjects\Kantan\Kantan\bin\Release\net9.0\Kantan.dll - ..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net8.0\Kantan.Net.dll + ..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net9.0\Kantan.Net.dll - ..\..\..\VSProjects\Novus\Novus\bin\Release\net8.0\Novus.dll + ..\..\..\VSProjects\Novus\Novus\bin\Release\net9.0\Novus.dll