Skip to content

Commit 9d028d2

Browse files
textGamextextGamex
committed
deps: 更新依赖
1 parent e881d42 commit 9d028d2

File tree

4 files changed

+40
-32
lines changed

4 files changed

+40
-32
lines changed

‎Moder.Core/Moder.Core.csproj‎

Lines changed: 35 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,63 +10,71 @@
1010
<LangVersion>preview</LangVersion>
1111
<ApplicationIcon>logo.ico</ApplicationIcon>
1212
<MvvmToolkitEnableINotifyPropertyChangingSupport>false</MvvmToolkitEnableINotifyPropertyChangingSupport>
13-
<Configurations>Debug;Release;Debug-Linux</Configurations>
14-
<Platforms>AnyCPU</Platforms>
13+
<Configurations>Debug;Release;Debug-Linux;Release-Linux</Configurations>
14+
<Platforms>AnyCPU;x64</Platforms>
15+
<SelfContained>true</SelfContained>
16+
<!-- 在较老版本的 Windows 上运行，需要设置CETCompat为false, 见 https://github.com/dotnet/runtime/issues/110000 -->
17+
<CETCompat>false</CETCompat>
1518
</PropertyGroup>
1619

1720
<ItemGroup>
18-
<PackageReference Include="Avalonia" Version="11.2.2"/>
19-
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.1.0" />
20-
<PackageReference Include="Avalonia.Desktop" Version="11.2.2"/>
21-
<PackageReference Include="Avalonia.Svg.Skia" Version="11.2.0.2" />
22-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.2.2"/>
23-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.2.2"/>
21+
<PackageReference Include="Avalonia" Version="11.3.4" />
22+
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
23+
<PackageReference Include="Avalonia.Desktop" Version="11.3.4" />
24+
<PackageReference Include="Avalonia.Svg.Skia" Version="11.3.0" />
25+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.4" />
26+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.4" />
2427
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
25-
<PackageReference Include="Avalonia.Diagnostics" Version="11.2.2">
28+
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.4">
2629
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
2730
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
2831
</PackageReference>
29-
<PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.2.0.1" />
30-
<PackageReference Include="AvaloniaEdit.TextMate" Version="11.1.0" />
31-
<PackageReference Include="DynamicData" Version="9.0.4" />
32-
<PackageReference Include="FluentAvaloniaUI" Version="2.2.0" />
32+
<PackageReference Include="Avalonia.Xaml.Interactivity" Version="11.3.0.6" />
33+
<PackageReference Include="AvaloniaEdit.TextMate" Version="11.3.0" />
34+
<PackageReference Include="DynamicData" Version="9.4.1" />
35+
<PackageReference Include="FluentAvaloniaUI" Version="2.4.0" />
3336
<PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
34-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
37+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
3538
<PackageReference Include="Ardalis.SmartEnum" Version="8.2.0" />
3639
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
3740
<PackageReference Include="Enums.NET" Version="5.0.0" />
38-
<PackageReference Include="Fody" Version="6.9.1">
41+
<PackageReference Include="Fody" Version="6.9.3">
3942
<PrivateAssets>all</PrivateAssets>
4043
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4144
</PackageReference>
42-
<PackageReference Include="FSharp.Core" Version="9.0.100" />
43-
<PackageReference Include="MemoryPack" Version="1.21.3" />
44-
<PackageReference Include="MethodTimer.Fody" Version="3.2.2" />
45-
<PackageReference Include="NLog" Version="5.3.4" />
46-
<PackageReference Include="NLog.Extensions.Logging" Version="5.3.15" />
45+
<PackageReference Include="FSharp.Core" Version="9.0.303" />
46+
<PackageReference Include="MemoryPack" Version="1.21.4" />
47+
<PackageReference Include="MethodTimer.Fody" Version="3.2.3" />
48+
<PackageReference Include="NLog" Version="6.0.3" />
49+
<PackageReference Include="NLog.Extensions.Logging" Version="6.0.3" />
4750
<PackageReference Include="ParadoxPower" Version="0.5.1-beta" />
4851
<PackageReference Include="ParadoxPower.CSharpExtensions" Version="0.2.2-beta" />
4952
<PackageReference Include="Pfim" Version="0.11.3" />
50-
<PackageReference Include="Pidgin" Version="3.3.0" />
53+
<PackageReference Include="Pidgin" Version="3.5.0" />
5154
</ItemGroup>
5255

53-
<PropertyGroup Condition="'$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug-Linux'" >
56+
<PropertyGroup Condition="'$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Debug-Linux'">
5457
<DefineConstants>$(DefineConstants);ENABLE_XAML_HOT_RELOAD</DefineConstants>
5558
</PropertyGroup>
5659

5760
<ItemGroup>
58-
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.2.2" />
59-
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="2.1.0" />
60-
<PackageReference Include="HotAvalonia.Extensions" Version="2.1.0" PrivateAssets="All" />
61+
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="Avalonia.Markup.Xaml.Loader" Version="11.3.4" />
62+
<PackageReference Condition="$(DefineConstants.Contains(ENABLE_XAML_HOT_RELOAD))" Include="HotAvalonia" Version="3.0.0" PrivateAssets="All" Publish="True">
63+
64+
</PackageReference>
65+
<PackageReference Include="HotAvalonia.Extensions" Version="3.0.0" PrivateAssets="All" />
6166
</ItemGroup>
62-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
67+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' Or '$(Configuration)' == 'Release'">
6368
<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
6469
</PropertyGroup>
6570
<PropertyGroup Condition=" '$(Configuration)' == 'Debug-Linux' ">
6671
<DefineConstants>$(DefineConstants);LINUX;DEBUG</DefineConstants>
6772
</PropertyGroup>
73+
<PropertyGroup Condition=" '$(Configuration)' == 'Release-Linux' ">
74+
<DefineConstants>$(DefineConstants);LINUX;RELEASE</DefineConstants>
75+
</PropertyGroup>
6876
<ItemGroup>
69-
<PackageReference Condition="$(DefineConstants.Contains(WINDOWS))" Include="Vanara.Windows.Shell" Version="4.0.4" />
77+
<PackageReference Condition="$(DefineConstants.Contains(WINDOWS))" Include="Vanara.Windows.Shell" Version="4.2.0" />
7078
</ItemGroup>
7179

7280
<ItemGroup>

‎Moder.Core/Services/GameResources/Base/ResourcesService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public abstract partial class ResourcesService<TType, TContent, TParseResult> :
2929
protected ResourcesService(string folderOrFileRelativePath, WatcherFilter filter, PathType pathType)
3030
{
3131
_folderOrFileRelativePath = folderOrFileRelativePath;
32-
Log = LogManager.GetLogger(typeof(TType).FullName);
32+
Log = LogManager.GetLogger(typeof(TType).FullName ?? "NONE");
3333
_settingService = App.Services.GetRequiredService<AppSettingService>();
3434

3535
var gameResourcesPathService = App.Services.GetRequiredService<GameResourcesPathService>();

‎Moder.Hosting/Moder.Hosting.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<Configurations>Debug;Release;Debug-Linux</Configurations>
7+
<Configurations>Debug;Release;Debug-Linux;Release-Linux</Configurations>
88
<Platforms>AnyCPU</Platforms>
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Avalonia" Version="11.2.2" />
13-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0" />
12+
<PackageReference Include="Avalonia" Version="11.3.4" />
13+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.8" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

‎Moder.Language/Moder.Language.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFramework>net9.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<Configurations>Debug;Release;Debug-Linux</Configurations>
7+
<Configurations>Debug;Release;Debug-Linux;Release-Linux</Configurations>
88
<Platforms>AnyCPU</Platforms>
99
</PropertyGroup>
1010

0 commit comments

Comments
 (0)