Skip to content

Commit 71a29fa

Browse files
committed
update: 更新至.net9稳定版
1 parent c87d989 commit 71a29fa

File tree

6 files changed

+577
-500
lines changed

6 files changed

+577
-500
lines changed

src/NonsPlayer.Core/NonsPlayer.Core.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Inflatable.Lastfm" Version="1.2.0" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.2.24128.5" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
1515
<PackageReference Include="NAudio" Version="2.2.1" />
1616
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
1717
<PackageReference Include="RestSharp" Version="106.15.0" />
18-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
19-
<PackageReference Include="System.Management" Version="9.0.0-preview.2.24128.5" />
20-
<PackageReference Include="System.Text.Json" Version="9.0.0-preview.2.24128.5" />
21-
<PackageReference Include="z440.atl.core" Version="6.1.0" />
18+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
19+
<PackageReference Include="System.Management" Version="9.0.9" />
20+
<PackageReference Include="System.Text.Json" Version="9.0.9" />
21+
<PackageReference Include="z440.atl.core" Version="7.5.0" />
2222
</ItemGroup>
2323
</Project>

src/NonsPlayer.Updater/NonsPlayer.Updater.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.2.24128.5" />
11-
<PackageReference Include="NuGet.Versioning" Version="6.9.1" />
12-
<PackageReference Include="SharpCompress" Version="0.36.0" />
10+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.9" />
11+
<PackageReference Include="NuGet.Versioning" Version="6.14.0" />
12+
<PackageReference Include="SharpCompress" Version="0.40.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<ProjectReference Include="..\NonsPlayer.Core\NonsPlayer.Core.csproj"/>
16+
<ProjectReference Include="..\NonsPlayer.Core\NonsPlayer.Core.csproj" />
1717
</ItemGroup>
1818

1919
</Project>

src/NonsPlayer/NonsPlayer.csproj

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<ApplicationIcon>Assets\WindowIcon.ico</ApplicationIcon>
1010
<!--Target Settings-->
1111
<OutputType>WinExe</OutputType>
12-
<TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
12+
<TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
1313
<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
1414
<EnableWindowsTargeting>true</EnableWindowsTargeting>
1515
<CsWinRTAotOptimizerEnabled>true</CsWinRTAotOptimizerEnabled>
@@ -35,56 +35,56 @@
3535
</PropertyGroup>
3636

3737
<ItemGroup>
38-
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
38+
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
3939
<PackageReference Include="CommunityToolkit.WinUI" Version="7.1.2" />
4040
<PackageReference Include="CommunityToolkit.WinUI.UI.Controls" Version="7.1.2" />
41-
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240916" />
42-
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.1.240916" />
41+
<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.2.250402" />
42+
<PackageReference Include="CommunityToolkit.WinUI.Media" Version="8.2.250402" />
4343
</ItemGroup>
4444

4545
<ItemGroup>
46-
<PackageReference Include="WinUIEx" Version="2.5.0" />
47-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
48-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
49-
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
46+
<PackageReference Include="WinUIEx" Version="2.8.0" />
47+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.9" />
48+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.250916003" />
49+
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="3.0.0" />
5050
</ItemGroup>
5151

5252
<ItemGroup>
53-
<PackageReference Include="Serilog" Version="4.1.0" />
54-
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
53+
<PackageReference Include="Serilog" Version="4.3.0" />
54+
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.2" />
5555
<PackageReference Include="Serilog.Sinks.Console" Version="6.0.0" />
56-
<PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
56+
<PackageReference Include="Serilog.Sinks.File" Version="7.0.0" />
5757
</ItemGroup>
5858

5959
<ItemGroup>
6060
<PackageReference Include="System.Net.Http" Version="4.3.4" />
6161
<PackageReference Include="System.Private.Uri" Version="4.3.2" />
6262
<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
63-
<PackageReference Include="System.Management" Version="9.0.0" />
64-
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.0" />
65-
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.0" />
66-
<PackageReference Include="System.Text.Json" Version="9.0.0" />
63+
<PackageReference Include="System.Management" Version="9.0.9" />
64+
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="9.0.9" />
65+
<PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" />
66+
<PackageReference Include="System.Text.Json" Version="9.0.9" />
6767
</ItemGroup>
6868

6969
<ItemGroup>
70-
<PackageReference Include="Vanara.PInvoke.ComCtl32" Version="4.0.4" />
71-
<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.0.4" />
72-
<PackageReference Include="Vanara.PInvoke.Ole" Version="4.0.4" />
73-
<PackageReference Include="Vanara.PInvoke.SHCore" Version="4.0.4" />
74-
<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.0.4" />
70+
<PackageReference Include="Vanara.PInvoke.ComCtl32" Version="4.2.1" />
71+
<PackageReference Include="Vanara.PInvoke.DwmApi" Version="4.2.1" />
72+
<PackageReference Include="Vanara.PInvoke.Ole" Version="4.2.1" />
73+
<PackageReference Include="Vanara.PInvoke.SHCore" Version="4.2.1" />
74+
<PackageReference Include="Vanara.PInvoke.Shell32" Version="4.2.1" />
7575
</ItemGroup>
7676

7777
<ItemGroup>
78-
<PackageReference Include="Dapper" Version="2.1.28" />
79-
<PackageReference Include="F23.StringSimilarity" Version="5.1.0" />
78+
<PackageReference Include="Dapper" Version="2.1.66" />
79+
<PackageReference Include="F23.StringSimilarity" Version="6.0.0" />
8080
<PackageReference Include="ksemenenko.ColorThief" Version="1.1.1.4" />
8181
<PackageReference Include="MouseKeyHook" Version="5.7.1" />
8282
<PackageReference Include="NAudio" Version="2.2.1" />
83-
<PackageReference Include="NuGet.Versioning" Version="6.9.1" />
84-
<PackageReference Include="QRCoder" Version="1.4.3" />
83+
<PackageReference Include="NuGet.Versioning" Version="6.14.0" />
84+
<PackageReference Include="QRCoder" Version="1.6.0" />
8585
<PackageReference Include="RestSharp" Version="106.15.0" />
86-
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
87-
<PackageReference Include="z440.atl.core" Version="6.1.0" />
86+
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.11" />
87+
<PackageReference Include="z440.atl.core" Version="7.5.0" />
8888
<PackageReference Include="LiteDB" Version="5.0.21" />
8989
<Manifest Include="$(ApplicationManifest)" />
9090
</ItemGroup>

src/NonsPlayer/Strings/zh-cn/Resources.resw

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,4 +587,7 @@
587587
<data name="Update" xml:space="preserve">
588588
<value>更新</value>
589589
</data>
590+
<data name="AdapterButtonRefresh.ToolTipService.ToolTip" xml:space="preserve">
591+
<value>点击以强制刷新</value>
592+
</data>
590593
</root>

src/NonsPlayer/Views/Pages/AdapterManagerPage.xaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,19 @@
3434
<RowDefinition Height="Auto" />
3535
<RowDefinition Height="Auto" />
3636
</Grid.RowDefinitions>
37-
<TextBlock Style="{StaticResource CommonTextStyle}"
38-
FontWeight="Bold"
39-
Text="NonsPlayer 插件商店" />
37+
<StackPanel Orientation="Horizontal">
38+
<TextBlock Style="{StaticResource CommonTextStyle}"
39+
FontWeight="Bold"
40+
Text="NonsPlayer 插件商店" />
41+
<Button x:Uid="AdapterButtonRefresh"
42+
Background="Transparent"
43+
BorderThickness="0"
44+
Padding="0"
45+
Margin="10,0,0,0">
46+
<FontIcon Glyph="&#xE72C;" FontSize="16"/>
47+
</Button>
48+
</StackPanel>
49+
4050
<Grid Grid.Row="1" Margin="0,10,0,0">
4151
<StackPanel Orientation="Horizontal">
4252
<TextBlock Style="{StaticResource CommonTextStyle}"

0 commit comments

Comments
 (0)