refactor: remove OSS projects and rework CI/DI setup

Co-authored-by: JusterZhu <11714536+JusterZhu@users.noreply.github.com>
Agent-Logs-Url: https://github.com/GeneralLibrary/GeneralUpdate.Maui/sessions/21607648-666e-43bc-a9bb-cb68459f20f1

Author: Copilot

.github/workflows/dotnet-ci.yaml

@@ -11,10 +11,12 @@ jobs:
     - name: Setup .NET SDK
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
     - name: Install .NET MAUI
       run: dotnet workload install maui
     - name: Restore dependencies
       run: dotnet restore ./src/GeneralUpdate.Maui.sln
     - name: build
-      run: dotnet build ./src/GeneralUpdate.Maui.sln -c Release
+      run: dotnet build ./src/GeneralUpdate.Maui.sln -c Release
+    - name: test
+      run: dotnet test ./src/GeneralUpdate.Maui.Android.Tests/GeneralUpdate.Maui.Android.Tests.csproj -c Release -p:TargetFramework=net10.0

README.md

@@ -4,14 +4,13 @@ This project is a subproject of GeneralUpdate, designed to be compatible with .N
 
 | Platform | Support | Framework version |
 | -------- | ------- | ----------------- |
-| Android  | Yes     | .NET8             |
+| Android  | Yes     | .NET10            |
 | Windows  | -       | -                 |
 | iOS      | -       | -                 |
 | Mac      | -       | -                 |
 
 ## Projects
 
-- `GeneralUpdate.Maui.OSS`: Existing OSS-based MAUI update package.
 - `GeneralUpdate.Maui.Android`: UI-less Android auto-update core for .NET MAUI, including:
   - Update discovery from external metadata
   - Resumable APK download via `HttpClient` and HTTP range requests

src/GeneralUpdate.Maui.Android.Tests/GeneralUpdate.Maui.Android.Tests.csproj

@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.0" />
     <PackageReference Include="xunit" Version="2.9.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" />

src/GeneralUpdate.Maui.Android.Tests/GeneralUpdateBootstrapDiTests.cs

@@ -0,0 +1,23 @@
+using GeneralUpdate.Maui.Android.Abstractions;
+using GeneralUpdate.Maui.Android.Services;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace GeneralUpdate.Maui.Android.Tests;
+
+public sealed class GeneralUpdateBootstrapDiTests
+{
+    [Fact]
+    public void AddGeneralUpdateMauiAndroid_RegistersBootstrapAndCoreServices()
+    {
+        var services = new ServiceCollection();
+
+        services.AddGeneralUpdateMauiAndroid();
+
+        using var provider = services.BuildServiceProvider();
+        var bootstrap = provider.GetRequiredService<IAndroidBootstrap>();
+
+        Assert.NotNull(bootstrap);
+        Assert.IsType<AndroidBootstrap>(bootstrap);
+    }
+}

src/GeneralUpdate.Maui.Android/GeneralUpdate.Maui.Android.csproj

@@ -9,4 +9,9 @@
     <Description>GeneralUpdate.Maui.Android is a UI-less Android auto-update core component for .NET MAUI.</Description>
     <GeneratePackageOnBuild>False</GeneratePackageOnBuild>
   </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
+  </ItemGroup>
 </Project>

src/GeneralUpdate.Maui.Android/README.md

@@ -17,6 +17,19 @@ UI-less Android auto-update core for .NET MAUI, focused on reusable update orche
 
 Reference the project/package in your MAUI app and configure Android `FileProvider` authority.
 
+### Dependency Injection (DI)
+
+```csharp
+using GeneralUpdate.Maui.Android.Services;
+using Microsoft.Extensions.DependencyInjection;
+
+var services = new ServiceCollection();
+services.AddGeneralUpdateMauiAndroid();
+
+using var provider = services.BuildServiceProvider();
+var bootstrap = provider.GetRequiredService<IAndroidBootstrap>();
+```
+
 ## Quick Start
 
 ```csharp

src/GeneralUpdate.Maui.Android/README.zh-CN.md

@@ -17,6 +17,19 @@
 
 在 MAUI 应用中引用该项目/包，并配置 Android `FileProvider` authority。
 
+### 依赖注入（DI）
+
+```csharp
+using GeneralUpdate.Maui.Android.Services;
+using Microsoft.Extensions.DependencyInjection;
+
+var services = new ServiceCollection();
+services.AddGeneralUpdateMauiAndroid();
+
+using var provider = services.BuildServiceProvider();
+var bootstrap = provider.GetRequiredService<IAndroidBootstrap>();
+```
+
 ## 快速开始
 
 ```csharp

src/GeneralUpdate.Maui.Android/Services/GeneralUpdateBootstrap.cs

@@ -1,5 +1,7 @@
 using GeneralUpdate.Maui.Android.Abstractions;
 using GeneralUpdate.Maui.Android.Platform.Android;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection.Extensions;
 
 namespace GeneralUpdate.Maui.Android.Services;
 
@@ -8,6 +10,29 @@ namespace GeneralUpdate.Maui.Android.Services;
 /// </summary>
 public static class GeneralUpdateBootstrap
 {
+    public static IServiceCollection AddGeneralUpdateMauiAndroid(
+        this IServiceCollection services,
+        HttpClient? httpClient = null)
+    {
+        ArgumentNullException.ThrowIfNull(services);
+
+        if (httpClient is not null)
+        {
+            services.TryAddSingleton<IUpdateDownloader>(new HttpRangeDownloader(httpClient));
+        }
+        else
+        {
+            services.AddHttpClient<IUpdateDownloader, HttpRangeDownloader>();
+        }
+        services.AddSingleton<IHashValidator, Sha256Validator>();
+        services.AddSingleton<IApkInstaller, AndroidApkInstaller>();
+        services.AddSingleton<IUpdateStorageProvider, UpdateFileStore>();
+        services.AddSingleton<IUpdateLogger>(NullUpdateLogger.Instance);
+        services.AddSingleton<IAndroidBootstrap, AndroidBootstrap>();
+
+        return services;
+    }
+
     public static IAndroidBootstrap CreateDefault(HttpClient? httpClient = null, IUpdateLogger? logger = null)
     {
         var client = httpClient ?? new HttpClient();