From 27be3756a2a4469d3af0b1478883fc264a674099 Mon Sep 17 00:00:00 2001 From: JusterZhu Date: Sat, 13 Jun 2026 15:48:32 +0800 Subject: [PATCH 1/2] feat: upgrade to net10.0-android and add NuGet packaging metadata - Upgrade target framework from net8.0-android34.0 to net10.0-android - Upgrade tests from net8.0 to net10.0 - Add NuGet packaging metadata (Version, License, Readme, SourceLink, snupkg) - Add GeneralUpdate.Avalonia.slnx to manage src projects - Update global.json to use latestMajor rollForward - Fix SupportedOSPlatformVersion from 21 to 26 - Update .gitignore to exclude .idea/ - Update README with new target framework info Co-Authored-By: Claude --- .gitignore | 2 +- README.md | 4 +-- global.json | 5 +-- .../GeneralUpdate.Avalonia.Android.csproj | 31 ++++++++++++++++--- src/GeneralUpdate.Avalonia.slnx | 5 +++ ...eneralUpdate.Avalonia.Android.Tests.csproj | 2 +- 6 files changed, 39 insertions(+), 10 deletions(-) create mode 100644 src/GeneralUpdate.Avalonia.slnx diff --git a/.gitignore b/.gitignore index 35063fc..e86fb8a 100644 --- a/.gitignore +++ b/.gitignore @@ -51,4 +51,4 @@ CodeCoverage/ # NUnit *.VisualState.xml TestResult.xml -nunit-*.xml \ No newline at end of file +nunit-*.xmlsrc/.idea/ diff --git a/README.md b/README.md index ed481e8..474e613 100644 --- a/README.md +++ b/README.md @@ -25,8 +25,8 @@ ### 环境准备 -- .NET SDK：`8.0+` -- 平台：`Android (net8.0-android)` +- .NET SDK：`8.0+`（推荐 `10.0+`） +- 平台：`Android (net10.0-android)` 或 `net8.0-android` - Avalonia：`12+` - Git：`2.30+` diff --git a/global.json b/global.json index 1781139..a6d57a5 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "sdk": { - "version": "8.0.418", - "rollForward": "latestFeature" + "version": "8.0.100", + "rollForward": "latestMajor", + "allowPrerelease": true } } diff --git a/src/GeneralUpdate.Avalonia.Android/GeneralUpdate.Avalonia.Android.csproj b/src/GeneralUpdate.Avalonia.Android/GeneralUpdate.Avalonia.Android.csproj index 448ad96..d6da548 100644 --- a/src/GeneralUpdate.Avalonia.Android/GeneralUpdate.Avalonia.Android.csproj +++ b/src/GeneralUpdate.Avalonia.Android/GeneralUpdate.Avalonia.Android.csproj @@ -1,19 +1,42 @@ - net8.0-android34.0 - 21.0 + net10.0-android + 26.0 enable enable latest + + true GeneralUpdate.Avalonia.Android - UI-free, Avalonia-compatible Android auto-update core library. + 1.0.0 + UI-free, Avalonia-compatible Android auto-update core library. Provides version comparison, resumable APK download with SHA256 verification, and APK installation orchestration. GeneralLibrary + Copyright (c) GeneralLibrary + Apache-2.0 + https://github.com/GeneralLibrary/GeneralUpdate.Avalonia https://github.com/GeneralLibrary/GeneralUpdate.Avalonia - avalonia;android;update;apk;autoupdate + git + avalonia;android;update;apk;autoupdate;generalupdate + README.md + https://github.com/GeneralLibrary/GeneralUpdate.Avalonia/releases + + + true + true + true + snupkg + + + true + + + + + diff --git a/src/GeneralUpdate.Avalonia.slnx b/src/GeneralUpdate.Avalonia.slnx new file mode 100644 index 0000000..75eeff4 --- /dev/null +++ b/src/GeneralUpdate.Avalonia.slnx @@ -0,0 +1,5 @@ + + + + + diff --git a/tests/GeneralUpdate.Avalonia.Android.Tests/GeneralUpdate.Avalonia.Android.Tests.csproj b/tests/GeneralUpdate.Avalonia.Android.Tests/GeneralUpdate.Avalonia.Android.Tests.csproj index f4c33be..97bd23b 100644 --- a/tests/GeneralUpdate.Avalonia.Android.Tests/GeneralUpdate.Avalonia.Android.Tests.csproj +++ b/tests/GeneralUpdate.Avalonia.Android.Tests/GeneralUpdate.Avalonia.Android.Tests.csproj @@ -1,6 +1,6 @@ - net8.0 + net10.0 enable enable false From 1bd7c0233393893623f646b11139af4aae4373ef Mon Sep 17 00:00:00 2001 From: JusterZhu Date: Sat, 13 Jun 2026 16:03:31 +0800 Subject: [PATCH 2/2] fix: address Copilot review comments - Pin global.json SDK to 10.0.100 (net10.0 requires 10.x SDK) - Add Microsoft.SourceLink.GitHub package reference for proper SourceLink - Update README: remove net8.0 references, require only net10.0 - Add .idea/ to .gitignore Co-Authored-By: Claude --- .gitignore | 3 +++ README.md | 6 +++--- global.json | 2 +- .../GeneralUpdate.Avalonia.Android.csproj | 4 ++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e86fb8a..e835cef 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,6 @@ CodeCoverage/ *.VisualState.xml TestResult.xml nunit-*.xmlsrc/.idea/ + +# JetBrains Rider +.idea/ diff --git a/README.md b/README.md index 474e613..b9c33d5 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ ## 项目简介 -`GeneralUpdate.Avalonia` 是面向 Avalonia 应用的更新能力仓库。当前核心模块为 `GeneralUpdate.Avalonia.Android`，提供 Android 平台自动更新流程编排能力（无 UI），适配 `net8.0-android`，面向 Avalonia 12+ 应用。 +`GeneralUpdate.Avalonia` 是面向 Avalonia 应用的更新能力仓库。当前核心模块为 `GeneralUpdate.Avalonia.Android`，提供 Android 平台自动更新流程编排能力（无 UI），适配 `net10.0-android`，面向 Avalonia 12+ 应用。 项目将更新流程拆分为可组合的抽象接口，便于在不同业务场景下替换版本比较、下载、哈希校验、安装拉起、日志与事件分发实现。 @@ -25,8 +25,8 @@ ### 环境准备 -- .NET SDK：`8.0+`（推荐 `10.0+`） -- 平台：`Android (net10.0-android)` 或 `net8.0-android` +- .NET SDK：`10.0+` +- 平台：`Android (net10.0-android)` - Avalonia：`12+` - Git：`2.30+` diff --git a/global.json b/global.json index a6d57a5..b48eef4 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "8.0.100", + "version": "10.0.100", "rollForward": "latestMajor", "allowPrerelease": true } diff --git a/src/GeneralUpdate.Avalonia.Android/GeneralUpdate.Avalonia.Android.csproj b/src/GeneralUpdate.Avalonia.Android/GeneralUpdate.Avalonia.Android.csproj index d6da548..f4e0243 100644 --- a/src/GeneralUpdate.Avalonia.Android/GeneralUpdate.Avalonia.Android.csproj +++ b/src/GeneralUpdate.Avalonia.Android/GeneralUpdate.Avalonia.Android.csproj @@ -32,6 +32,10 @@ + + all + runtime; build; native; contentfiles; analyzers; buildtransitive +