Skip to content

Commit 2063cb0

Browse files
tangge233tangge233
authored
Merge pull request PCL-Community#158 from PCL-Community/chore/upd-dep
Approve
1 parent 5fe4f74 commit 2063cb0

File tree

5 files changed

+38
-35
lines changed

5 files changed

+38
-35
lines changed

‎.github/workflows/build.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ jobs:
100100
run: |
101101
cd ./PCL.Neo
102102
sudo su
103-
dotnet publish -r win-x86 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
104-
dotnet publish -r win-x64 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
105-
dotnet publish -r win-arm64 --self-contained true -p:PublishSingleFile=true -p:TrimMode=copyused
106-
mv ./bin/Release/net9.0/win-x86/publish/PCL.Neo.exe ./bin/Release/net9.0/win-x86/publish/PCL.Neo.win.x86.exe
107-
mv ./bin/Release/net9.0/win-x64/publish/PCL.Neo.exe ./bin/Release/net9.0/win-x64/publish/PCL.Neo.win.x64.exe
108-
mv ./bin/Release/net9.0/win-arm64/publish/PCL.Neo.exe ./bin/Release/net9.0/win-arm64/publish/PCL.Neo.win.arm64.exe
109-
cd ./bin/Release/net9.0/
103+
dotnet publish -r win-x86
104+
dotnet publish -r win-x64
105+
dotnet publish -r win-arm64
106+
mv ./bin/Release/net10.0/win-x86/publish/PCL.Neo.exe ./bin/Release/net10.0/win-x86/publish/PCL.Neo.win.x86.exe
107+
mv ./bin/Release/net10.0/win-x64/publish/PCL.Neo.exe ./bin/Release/net10.0/win-x64/publish/PCL.Neo.win.x64.exe
108+
mv ./bin/Release/net10.0/win-arm64/publish/PCL.Neo.exe ./bin/Release/net10.0/win-arm64/publish/PCL.Neo.win.arm64.exe
109+
cd ./bin/Release/net10.0/
110110
cd ./win-x86/
111111
zip -9 -r "../PCL.Neo.win.x86.zip" "./publish"
112112
cd ../
@@ -120,16 +120,16 @@ jobs:
120120
with:
121121
name: win.x64
122122
path: |
123-
PCL.Neo/bin/Release/net9.0/PCL.Neo.win.x64.zip
123+
PCL.Neo/bin/Release/net10.0/PCL.Neo.win.x64.zip
124124
- name: UploadArtifacts win.x86
125125
uses: actions/upload-artifact@v4
126126
with:
127127
name: win.x86
128128
path: |
129-
PCL.Neo/bin/Release/net9.0/PCL.Neo.win.x86.zip
129+
PCL.Neo/bin/Release/net10.0/PCL.Neo.win.x86.zip
130130
- name: UploadArtifacts win.arm64
131131
uses: actions/upload-artifact@v4
132132
with:
133133
name: win.arm64
134134
path: |
135-
PCL.Neo/bin/Release/net9.0/PCL.Neo.win.arm64.zip
135+
PCL.Neo/bin/Release/net10.0/PCL.Neo.win.arm64.zip

‎PCL.Neo.Core/PCL.Neo.Core.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Avalonia" Version="11.3.2" />
11+
<PackageReference Include="Avalonia" Version="11.3.10" />
1212
<PackageReference Include="LZMA-SDK" Version="22.1.1" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
15-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.1" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
15+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
1616
<PackageReference Include="SevenZip" Version="19.0.0" />
17-
<PackageReference Include="SkiaSharp" Version="3.119.0" />
18-
<PackageReference Include="System.Reactive" Version="6.0.1" />
19-
<PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
17+
<PackageReference Include="SkiaSharp" Version="3.119.1" />
18+
<PackageReference Include="System.Reactive" Version="6.1.0" />
19+
<PackageReference Include="System.Reactive.Linq" Version="6.1.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
2423
<PackageReference Include="Tomlyn" Version="0.19.0" />
2524
<PackageReference Include="UltimateLogSystem" Version="1.1.0" />
2625
</ItemGroup>

‎PCL.Neo.Tests/PCL.Neo.Tests.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
</PropertyGroup>
77

‎PCL.Neo/PCL.Neo.csproj‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>WinExe</OutputType>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<BuiltInComInteropSupport>true</BuiltInComInteropSupport>
77
<ApplicationManifest>app.manifest</ApplicationManifest>
@@ -16,7 +16,11 @@
1616
<CFBundleExecutable>PCL.Neo</CFBundleExecutable>
1717
<CFBundleIconFile>Assets/Icon.ico</CFBundleIconFile>
1818
<CFBundleShortVersionString>1.0</CFBundleShortVersionString>
19-
<PublishTrimmed>false</PublishTrimmed>
19+
<PublishTrimmed>true</PublishTrimmed>
20+
<TrimMode>partial</TrimMode>
21+
<PublishSingleFile>true</PublishSingleFile>
22+
<PublishReadyToRun>true</PublishReadyToRun>
23+
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
2024
</PropertyGroup>
2125

2226
<ItemGroup>
@@ -29,24 +33,24 @@
2933
</ItemGroup>
3034

3135
<ItemGroup>
32-
<PackageReference Include="Avalonia" Version="11.3.2" />
33-
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.2" />
34-
<PackageReference Include="Avalonia.Desktop" Version="11.3.2" />
35-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.2" />
36-
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.2" />
36+
<PackageReference Include="Avalonia" Version="11.3.10" />
37+
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.3.10" />
38+
<PackageReference Include="Avalonia.Desktop" Version="11.3.10" />
39+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.3.10" />
40+
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.3.10" />
3741
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
38-
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.2">
42+
<PackageReference Include="Avalonia.Diagnostics" Version="11.3.10">
3943
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
4044
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
4145
</PackageReference>
4246
<PackageReference Include="DotNet.Bundle" Version="0.9.13" />
4347
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
44-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
48+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.1" />
4549
<PackageReference Include="LZMA-SDK" Version="22.1.1" />
46-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
47-
<PackageReference Include="System.Reactive" Version="6.0.1" />
48-
<PackageReference Include="System.Reactive.Linq" Version="6.0.1" />
49-
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.2" />
50+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="10.0.1" />
51+
<PackageReference Include="System.Reactive" Version="6.1.0" />
52+
<PackageReference Include="System.Reactive.Linq" Version="6.1.0" />
53+
<PackageReference Include="Xaml.Behaviors.Avalonia" Version="11.3.9" />
5054
</ItemGroup>
5155

5256
<ItemGroup>

‎mac-publish-assets/package-mac.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mkdir -p x64
1818

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

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

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

5050
if [ -d "$APP_NAME_X64" ]; then
5151
rm -rf "$APP_NAME_X64"

0 commit comments

Comments
 (0)