Skip to content

Commit bfbc83e

Browse files
DecimationDecimation
committed
.NET 9
1 parent 9074746 commit bfbc83e

File tree

7 files changed

+83
-83
lines changed

7 files changed

+83
-83
lines changed

‎SmartImage.Lib/Engines/Impl/Search/TraceMoeEngine.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ public string EpisodeString
220220
string epStr = Episode is { } ? Episode is string s ? s : Episode.ToString() : string.Empty;
221221

222222
if (Episode is IEnumerable e && e is not string) {
223-
var epList = e.CastToList()
223+
var epList = e.Cast<object>()
224224
.Select(x =>
225225
{
226226
var s1 = x.ToString();

‎SmartImage.Lib/SmartImage.Lib.csproj

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<RootNamespace>SmartImage.Lib</RootNamespace>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Configurations>Debug;Release;Test;UnitTest</Configurations>
@@ -42,32 +42,32 @@
4242
<PackageReference Include="AngleSharp.Io" Version="1.0.0" />
4343
<PackageReference Include="AngleSharp.Js" Version="0.15.0" />
4444
<PackageReference Include="AngleSharp.XPath" Version="2.0.4" />
45-
<PackageReference Include="CliWrap" Version="3.6.7" />
45+
<PackageReference Include="CliWrap" Version="3.7.0" />
4646
<PackageReference Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
47-
<PackageReference Include="CommunityToolkit.Common" Version="8.3.2" />
47+
<PackageReference Include="CommunityToolkit.Common" Version="8.4.0" />
4848
<PackageReference Include="Flurl.Http" Version="4.0.2" />
4949
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
50-
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.10" />
51-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
50+
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
51+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
5252
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
5353
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
54-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
55-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
56-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
57-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
58-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
59-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
60-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
61-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
62-
<PackageReference Include="Microsoft.Extensions.Options" Version="8.0.2" />
63-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
54+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
55+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
56+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
57+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
58+
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
59+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
60+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
61+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
62+
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.0" />
63+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
6464
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
65-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
66-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
67-
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
65+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
66+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
67+
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
6868
<PackageReference Include="System.Reactive" Version="6.0.1" />
69-
<PackageReference Include="System.Runtime.Caching" Version="8.0.1" />
70-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
69+
<PackageReference Include="System.Runtime.Caching" Version="9.0.0" />
70+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
7171
<PackageReference Include="Verify.Flurl" Version="1.0.0" />
7272
</ItemGroup>
7373

@@ -76,13 +76,13 @@
7676
<HintPath>..\..\..\VSProjects\FlareSolverrSharp\src\FlareSolverrSharp\bin\Release\net8.0\FlareSolverrSharp.dll</HintPath>
7777
</Reference>
7878
<Reference Include="Kantan">
79-
<HintPath>..\..\..\VSProjects\Kantan\Kantan\bin\Release\net8.0\Kantan.dll</HintPath>
79+
<HintPath>..\..\..\VSProjects\Kantan\Kantan\bin\Release\net9.0\Kantan.dll</HintPath>
8080
</Reference>
8181
<Reference Include="Kantan.Net">
82-
<HintPath>..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net8.0\Kantan.Net.dll</HintPath>
82+
<HintPath>..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net9.0\Kantan.Net.dll</HintPath>
8383
</Reference>
8484
<Reference Include="Novus">
85-
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net8.0\Novus.dll</HintPath>
85+
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net9.0\Novus.dll</HintPath>
8686
</Reference>
8787
</ItemGroup>
8888

‎SmartImage.Rdx/SmartImage.Rdx.csproj

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
<DefineConstants>JETBRAINS_ANNOTATIONS;TRACE</DefineConstants>
@@ -44,35 +44,35 @@
4444
<Content Include="Icon.ico" />
4545
</ItemGroup>
4646
<ItemGroup>
47-
<PackageReference Include="CliWrap" Version="3.6.7" />
47+
<PackageReference Include="CliWrap" Version="3.7.0" />
4848
<PackageReference Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
49-
<PackageReference Include="CommunityToolkit.Common" Version="8.3.2" />
49+
<PackageReference Include="CommunityToolkit.Common" Version="8.4.0" />
5050
<PackageReference Include="Flurl.Http" Version="4.0.2" />
5151
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
52-
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.10" />
53-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
52+
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
53+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
5454
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
5555
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
56-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
57-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
58-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
59-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
60-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
61-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
62-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
56+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
57+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
58+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
59+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
60+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
61+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
62+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
6363
<PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" />
6464
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
65-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
65+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
6666
<PackageReference Include="Spectre.Console" Version="0.49.1" />
6767
<PackageReference Include="Spectre.Console.Analyzer" Version="1.0.0">
6868
<PrivateAssets>all</PrivateAssets>
6969
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
7070
</PackageReference>
7171
<PackageReference Include="Spectre.Console.Cli" Version="0.49.1" />
7272
<PackageReference Include="Spectre.Console.ImageSharp" Version="0.49.1" />
73-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
73+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.0" />
7474
<PackageReference Include="System.Reactive" Version="6.0.1" />
75-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
75+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
7676
<PackageReference Include="Verify.Flurl" Version="1.0.0" />
7777
</ItemGroup>
7878

@@ -85,17 +85,17 @@
8585
<HintPath>..\..\..\VSProjects\FlareSolverrSharp\src\FlareSolverrSharp\bin\Release\net8.0\FlareSolverrSharp.dll</HintPath>
8686
</Reference>
8787
<Reference Include="Kantan">
88-
<HintPath>..\..\..\VSProjects\Kantan\Kantan\bin\Release\net8.0\Kantan.dll</HintPath>
88+
<HintPath>..\..\..\VSProjects\Kantan\Kantan\bin\Release\net9.0\Kantan.dll</HintPath>
8989
</Reference>
9090
<Reference Include="Kantan.Net">
91-
<HintPath>..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net8.0\Kantan.Net.dll</HintPath>
91+
<HintPath>..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net9.0\Kantan.Net.dll</HintPath>
9292
</Reference>
9393
<Reference Include="Novus">
94-
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net8.0\Novus.dll</HintPath>
94+
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net9.0\Novus.dll</HintPath>
9595
</Reference>
9696
<!--
9797
<Reference Include="Novus">
98-
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net8.0\Novus.dll</HintPath>
98+
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net9.0\Novus.dll</HintPath>
9999
</Reference>
100100
-->
101101
</ItemGroup>

‎SmartImage.UI/MainWindow.xaml.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,12 +59,12 @@
5959
using System.Reactive.Linq;
6060
using System.Runtime;
6161
using System.Runtime.Caching;
62-
using ReactiveUI;
62+
// using ReactiveUI;
6363
using Brush = System.Drawing.Brush;
6464
using Brushes = System.Windows.Media.Brushes;
6565
using System.Buffers;
6666
using System.Reflection;
67-
using DynamicData;
67+
// using DynamicData;
6868
using SmartImage.Lib.Clients;
6969
using SmartImage.UI.Controls;
7070
using SmartImage.Lib.Images;
@@ -819,7 +819,11 @@ private static IEnumerable<ResultItem> Convert(SearchResult result)
819819

820820
private void ConvertAddResultItems(SearchResult result)
821821
{
822-
CurrentQuery.Results.AddRange(Convert(result));
822+
var r = Convert(result);
823+
foreach (ResultItem resultItem in r) {
824+
CurrentQuery.Results.Add(resultItem);
825+
826+
}
823827
}
824828

825829
#endregion

‎SmartImage.UI/SmartImage.UI.csproj

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework>net8.0-windows</TargetFramework>
5+
<TargetFramework>net9.0-windows</TargetFramework>
66
<Nullable>enable</Nullable>
77
<UseWPF>true</UseWPF>
88
<DefineConstants>JETBRAINS_ANNOTATIONS;TRACE</DefineConstants>
@@ -64,16 +64,17 @@
6464

6565
<ItemGroup>
6666
<PackageReference Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
67-
<PackageReference Include="CommunityToolkit.Common" Version="8.3.2" />
67+
<PackageReference Include="CommunityToolkit.Common" Version="8.4.0" />
6868
<PackageReference Include="Flurl.Http" Version="4.0.2" />
6969
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
70-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
71-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
72-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
73-
<PackageReference Include="ReactiveUI.WPF" Version="20.1.63" />
74-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
75-
<PackageReference Include="System.Drawing.Common" Version="8.0.10" />
76-
<PackageReference Include="System.Text.Json" Version="8.0.5" />
70+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
71+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
72+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
73+
<!-- <PackageReference Include="ReactiveUI.WPF" Version="20.1.63" /> -->
74+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
75+
<PackageReference Include="System.Drawing.Common" Version="9.0.0" />
76+
<PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.2" />
77+
<PackageReference Include="System.Text.Json" Version="9.0.0" />
7778
<PackageReference Include="Verify.Flurl" Version="1.0.0" />
7879
</ItemGroup>
7980

@@ -86,13 +87,13 @@
8687
<HintPath>..\..\..\VSProjects\FlareSolverrSharp\src\FlareSolverrSharp\bin\Release\net8.0\FlareSolverrSharp.dll</HintPath>
8788
</Reference>
8889
<Reference Include="Kantan">
89-
<HintPath>..\..\..\VSProjects\Kantan\Kantan\bin\Release\net8.0\Kantan.dll</HintPath>
90+
<HintPath>..\..\..\VSProjects\Kantan\Kantan\bin\Release\net9.0\Kantan.dll</HintPath>
9091
</Reference>
9192
<Reference Include="Kantan.Net">
92-
<HintPath>..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net8.0\Kantan.Net.dll</HintPath>
93+
<HintPath>..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net9.0\Kantan.Net.dll</HintPath>
9394
</Reference>
9495
<Reference Include="Novus">
95-
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net8.0\Novus.dll</HintPath>
96+
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net9.0\Novus.dll</HintPath>
9697
</Reference>
9798
</ItemGroup>
9899

‎SmartImage.UI2/Program.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ IDisposable PostOnMainLoopAsTimeout()
4444
var composite = new CompositeDisposable(2);
4545

4646
object timeout = Application.MainLoop.AddTimeout(
47-
dueTime,
48-
() =>
47+
dueTime, (cb) =>
4948
{
5049
composite.Add(action(this, state));
5150

@@ -64,12 +63,8 @@ IDisposable PostOnMainLoopAsTimeout()
6463

6564
}
6665

67-
public class Item1
68-
{
69-
70-
66+
public class Item1 { }
7167

72-
}
7368
public static void Main(string[] args)
7469
{
7570
Application.Init();

‎SmartImage.UI2/SmartImage.UI2.csproj

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFramework>net9.0</TargetFramework>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Nullable>enable</Nullable>
88
</PropertyGroup>
99

1010
<ItemGroup>
1111
<PackageReference Include="Flurl.Http" Version="4.0.2" />
12-
<PackageReference Include="JetBrains.Annotations" Version="2024.2.0" />
13-
<PackageReference Include="ReactiveUI" Version="20.1.1" />
12+
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
13+
<PackageReference Include="ReactiveUI" Version="20.1.63" />
1414
<PackageReference Include="System.Reactive" Version="6.0.1" />
1515
<PackageReference Include="Terminal.Gui" Version="1.17.1" />
16-
<PackageReference Include="CliWrap" Version="3.6.6" />
16+
<PackageReference Include="CliWrap" Version="3.7.0" />
1717
<PackageReference Include="CoenM.ImageSharp.ImageHash" Version="1.3.6" />
18-
<PackageReference Include="CommunityToolkit.Common" Version="8.3.0" />
19-
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.7" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
22-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
23-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
24-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.0" />
25-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
26-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
27-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
18+
<PackageReference Include="CommunityToolkit.Common" Version="8.4.0" />
19+
<PackageReference Include="Microsoft.Data.Sqlite" Version="9.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
24+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
25+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
26+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
27+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
2828
<PackageReference Include="Microsoft.NETCore.Platforms" Version="8.0.0-preview.7.23375.6" />
2929
<PackageReference Include="Microsoft.VisualStudio.Validation" Version="17.8.8" />
30-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
30+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.6" />
3131
</ItemGroup>
3232

3333
<ItemGroup>
@@ -36,13 +36,13 @@
3636

3737
<ItemGroup>
3838
<Reference Include="Kantan">
39-
<HintPath>..\..\..\VSProjects\Kantan\Kantan\bin\Release\net8.0\Kantan.dll</HintPath>
39+
<HintPath>..\..\..\VSProjects\Kantan\Kantan\bin\Release\net9.0\Kantan.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Kantan.Net">
42-
<HintPath>..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net8.0\Kantan.Net.dll</HintPath>
42+
<HintPath>..\..\..\VSProjects\Kantan\Kantan.Net\bin\Release\net9.0\Kantan.Net.dll</HintPath>
4343
</Reference>
4444
<Reference Include="Novus">
45-
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net8.0\Novus.dll</HintPath>
45+
<HintPath>..\..\..\VSProjects\Novus\Novus\bin\Release\net9.0\Novus.dll</HintPath>
4646
</Reference>
4747
</ItemGroup>
4848

0 commit comments

Comments
 (0)