Skip to content

chore: update dependencies #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
whitecat346 merged 4 commits into from
Jan 2, 2026
Merged

chore: update dependencies #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d2770b4
chore: update dependencies
tangge233 Dec 21, 2025
4a7d354
fix: ci build error
tangge233 Dec 21, 2025
c38c3f9
perf(ci): single file on windows
tangge233 Dec 21, 2025
c2e06c8
fix(ci): macos build fail
tangge233 Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,13 @@ jobs:
run: |
cd ./PCL.Neo
sudo su
dotnet publish -r win-x86 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
dotnet publish -r win-x64 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
dotnet publish -r win-arm64 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
mv ./bin/Release/net9.0/win-x86/publish/PCL.Neo.exe ./bin/Release/net9.0/win-x86/publish/PCL.Neo.win.x86.exe
mv ./bin/Release/net9.0/win-x64/publish/PCL.Neo.exe ./bin/Release/net9.0/win-x64/publish/PCL.Neo.win.x64.exe
mv ./bin/Release/net9.0/win-arm64/publish/PCL.Neo.exe ./bin/Release/net9.0/win-arm64/publish/PCL.Neo.win.arm64.exe
cd ./bin/Release/net9.0/
dotnet publish -r win-x86
dotnet publish -r win-x64
dotnet publish -r win-arm64
mv ./bin/Release/net10.0/win-x86/publish/PCL.Neo.exe ./bin/Release/net10.0/win-x86/publish/PCL.Neo.win.x86.exe
mv ./bin/Release/net10.0/win-x64/publish/PCL.Neo.exe ./bin/Release/net10.0/win-x64/publish/PCL.Neo.win.x64.exe
mv ./bin/Release/net10.0/win-arm64/publish/PCL.Neo.exe ./bin/Release/net10.0/win-arm64/publish/PCL.Neo.win.arm64.exe
cd ./bin/Release/net10.0/
cd ./win-x86/
zip -9 -r "../PCL.Neo.win.x86.zip" "./publish"
cd ../
Expand All @@ -120,16 +120,16 @@ jobs:
with:
name: win.x64
path: |
PCL.Neo/bin/Release/net9.0/PCL.Neo.win.x64.zip
PCL.Neo/bin/Release/net10.0/PCL.Neo.win.x64.zip
- name: UploadArtifacts win.x86
uses: actions/upload-artifact@v4
with:
name: win.x86
path: |
PCL.Neo/bin/Release/net9.0/PCL.Neo.win.x86.zip
PCL.Neo/bin/Release/net10.0/PCL.Neo.win.x86.zip
- name: UploadArtifacts win.arm64
uses: actions/upload-artifact@v4
with:
name: win.arm64
path: |
PCL.Neo/bin/Release/net9.0/PCL.Neo.win.arm64.zip
PCL.Neo/bin/Release/net10.0/PCL.Neo.win.arm64.zip
17 changes: 8 additions & 9 deletions PCL.Neo.Core/PCL.Neo.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.2" />
<PackageReference Include="Avalonia" Version="11.3.10" />
<PackageReference Include="LZMA-SDK" Version="22.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
<PackageReference Include="SevenZip" Version="19.0.0" />
<PackageReference Include="SkiaSharp" Version="3.119.0" />
<PackageReference Include="System.Reactive" Version="6.0.1" />
<PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
<PackageReference Include="SkiaSharp" Version="3.119.1" />
<PackageReference Include="System.Reactive" Version="6.1.0" />
<PackageReference Include="System.Reactive.Linq" Version="6.1.0" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
<PackageReference Include="Tomlyn" Version="0.19.0" />
<PackageReference Include="UltimateLogSystem" Version="1.1.0" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion PCL.Neo.Tests/PCL.Neo.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<IsPackable>false</IsPackable>
</PropertyGroup>

Expand Down
30 changes: 17 additions & 13 deletions PCL.Neo/PCL.Neo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
<ApplicationManifest>app.manifest</ApplicationManifest>
Expand All @@ -16,7 +16,11 @@
<CFBundleExecutable>PCL.Neo</CFBundleExecutable>
<CFBundleIconFile>Assets/Icon.ico</CFBundleIconFile>
<CFBundleShortVersionString>1.0</CFBundleShortVersionString>
<PublishTrimmed>false</PublishTrimmed>
<PublishTrimmed>true</PublishTrimmed>
<TrimMode>partial</TrimMode>
<PublishSingleFile>true</PublishSingleFile>
<PublishReadyToRun>true</PublishReadyToRun>
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
</PropertyGroup>

<ItemGroup>
Expand All @@ -29,24 +33,24 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.3.2" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2" />
<PackageReference Include="Avalonia" Version="11.3.10" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.10" />
<PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.2">
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.10">
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
</PackageReference>
<PackageReference Include="DotNet.Bundle" Version="0.9.13" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
<PackageReference Include="LZMA-SDK" Version="22.1.1" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
<PackageReference Include="System.Reactive" Version="6.0.1" />
<PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.2" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
<PackageReference Include="System.Reactive" Version="6.1.0" />
<PackageReference Include="System.Reactive.Linq" Version="6.1.0" />
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.9" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions mac-publish-assets/package-mac.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ mkdir -p x64

# 打包 arm64 版本
APP_NAME_ARM64="arm64/PCL.Neo.app"
PUBLISH_OUTPUT_DIRECTORY_ARM64="../PCL.Neo/bin/Release/net9.0/osx-arm64/publish/."
PUBLISH_OUTPUT_DIRECTORY_ARM64="../PCL.Neo/bin/Release/net10.0/osx-arm64/publish/."

if [ -d "$APP_NAME_ARM64" ]; then
rm -rf "$APP_NAME_ARM64"
Expand All @@ -45,7 +45,7 @@ cp -a $PUBLISH_OUTPUT_DIRECTORY_ARM64/* "$APP_NAME_ARM64/Contents/MacOS/"

# 打包 x64 版本
APP_NAME_X64="x64/PCL.Neo.app"
PUBLISH_OUTPUT_DIRECTORY_X64="../PCL.Neo/bin/Release/net9.0/osx-x64/publish/."
PUBLISH_OUTPUT_DIRECTORY_X64="../PCL.Neo/bin/Release/net10.0/osx-x64/publish/."

if [ -d "$APP_NAME_X64" ]; then
rm -rf "$APP_NAME_X64"
Expand Down
Loading