Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion BUILD_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dotnet --version
dotnet --info
```

仓库通过 `global.json` 锁定 .NET SDK `10.0.302`,允许同一 feature band 内的 patch 前滚;Uno SDK 锁定为 `6.7.22`。版本不匹配时先安装 .NET 10 SDK,不要手改项目 TFM 或 `global.json`。
仓库通过 `global.json` 锁定 .NET SDK `10.0.302`,允许同一 feature band 内的 patch 前滚;Uno SDK 锁定为 `6.7.30`。版本不匹配时先安装 .NET 10 SDK,不要手改项目 TFM 或 `global.json`。

### 必需与可选依赖

Expand Down
2 changes: 1 addition & 1 deletion README.en.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ With Salmon Egg, you can connect to local or remote ACP services, create and res

## Tech Stack

- Uno Platform 6.7+ (repo pin: `Uno.Sdk` 6.7.22)
- Uno Platform 6.7+ (repo pin: `Uno.Sdk` 6.7.30)
- .NET 10 (repo pin: SDK 10.0.302, with 10.0.3xx patch roll-forward)
- WinUI 3 on Windows
- Clean Architecture + MVVM
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ Salmon Egg 是一款依托 ACP 协议打造的桌面端智能体客户端。

## 技术栈

- Uno Platform 6.7+(仓库锁定 `Uno.Sdk` 6.7.22)
- Uno Platform 6.7+(仓库锁定 `Uno.Sdk` 6.7.30)
- .NET 10(仓库锁定 SDK 10.0.302,允许 10.0.3xx patch 前滚)
- WinUI 3(Windows)
- Clean Architecture + MVVM
Expand Down
16 changes: 8 additions & 8 deletions SalmonEgg/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -18,22 +18,22 @@
<PackageVersion Include="Microsoft.Extensions.Localization" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.12" />
<PackageVersion Include="Microsoft.Graph" Version="6.6.0" />
<PackageVersion Include="Microsoft.Graph" Version="6.7.0" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.90.0" />
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.90.0" />
<!-- Stay on Windows App SDK 1.8 line until Uno 6.7 + WinUI packaging are validated on 2.x. -->
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.260804001" />
<PackageVersion Include="Microsoft.WindowsAppSDK.WinUI" Version="1.8.260803003" />
<PackageVersion Include="Serilog.Extensions.Logging" Version="10.0.0" />
<PackageVersion Include="OpenTelemetry" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.18.0" />
<PackageVersion Include="OpenTelemetry" Version="1.19.1" />
<PackageVersion Include="OpenTelemetry.Api" Version="1.19.1" />
<PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.19.1" />
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.19.1" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.19.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.19.0" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.12" />
<PackageVersion Include="System.Security.Permissions" Version="10.0.12" />
<PackageVersion Include="Uno.WinUI.Lottie" Version="6.7.103" />
<PackageVersion Include="Uno.WinUI.Lottie" Version="6.7.135" />
<PackageVersion Include="Uno.Extensions.Reactive" Version="7.3.6" />
<PackageVersion Include="Uno.Extensions.Reactive.WinUI" Version="7.3.6" />
<PackageVersion Include="Uno.Extensions.Reactive.Messaging" Version="7.3.6" />
Expand Down
2 changes: 1 addition & 1 deletion SalmonEgg/global.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
// To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
"msbuild-sdks": {
"Uno.Sdk": "6.7.22"
"Uno.Sdk": "6.7.30"
},
"sdk": {
"allowPrerelease": false
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"msbuild-sdks": {
"Uno.Sdk": "6.7.22"
"Uno.Sdk": "6.7.30"
},
"sdk": {
"version": "10.0.302",
Expand Down
10 changes: 5 additions & 5 deletions src/SalmonEgg.Infrastructure/SalmonEgg.Infrastructure.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<PackageReference Include="System.Reactive" Version="7.0.0" />
<PackageReference Include="Websocket.Client" Version="5.5.0" />
<PackageReference Include="YamlDotNet" Version="18.1.0" />
<PackageReference Include="OpenTelemetry" Version="1.18.0" />
<PackageReference Include="OpenTelemetry.Api" Version="1.18.0" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.18.0" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.18.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.18.0" />
<PackageReference Include="OpenTelemetry" Version="1.19.1" />
<PackageReference Include="OpenTelemetry.Api" Version="1.19.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.19.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.19.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.19.0" />
</ItemGroup>


Expand Down
Loading