chore(deps): update dependency tunit to 1.9.85

.github/workflows/nativeaot-test.yml

@@ -0,0 +1,35 @@
+name: NativeAOT Test
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test-aot:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9.0.x'
+
+      - name: Write Secret into file
+        uses: "DamianReeves/write-file-action@master"
+        with:
+          path: HyPlayer.NeteaseProvider.Tests/Secrets.cs
+          write-mode: overwrite
+          contents: |
+            ${{ secrets.NETEASE_LOGIN_SECRET }}
+
+      - name: Restore
+        run: dotnet restore -r linux-x64 -p:TargetFramework=net9.0
+
+      - name: Publish with AOT
+        run: dotnet publish -c Release -f net9.0 -r linux-x64 --no-restore
+
+      - name: Run AOT tests
+        run: ./HyPlayer.NeteaseProvider.Tests/bin/Release/net9.0/linux-x64/publish/HyPlayer.NeteaseProvider.Tests

.github/workflows/nuget-push.yml

@@ -29,9 +29,7 @@ jobs:
       - name: Restore dependencies
         run: dotnet restore
       - name: Build
-        run: dotnet build --no-restore
-      - name: Test
-        run: dotnet test --no-build --verbosity normal
+        run: dotnet build --no-restore --configuration Release
       - name: Build NuGet Packages
         run: |
           dotnet pack HyPlayer.NeteaseApi/HyPlayer.NeteaseApi.csproj -c Release -o Packages/

.github/workflows/test.yml

@@ -0,0 +1,76 @@
+name: Test
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  test:
+    name: Test on ${{ matrix.os }} - .NET ${{ matrix.dotnet-version }}
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [windows-latest]
+        dotnet-version: ['9.0.x']
+      fail-fast: false  # Continue running other jobs if one fails
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Setup .NET ${{ matrix.dotnet-version }}
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: ${{ matrix.dotnet-version }}
+
+      - name: Write Secret into file
+        uses: "DamianReeves/write-file-action@master"
+        with:
+          path: HyPlayer.NeteaseProvider.Tests/Secrets.cs
+          write-mode: overwrite
+          contents: |
+            ${{ secrets.NETEASE_LOGIN_SECRET }}
+
+      - name: Restore dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build --configuration Release --no-restore
+
+      - name: Run tests with coverage
+        run: dotnet test --configuration Release --no-build -- --coverage --report-trx --results-directory ./TestResults
+
+      - name: Upload test results
+        if: always()  # Run even if tests fail
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results-${{ matrix.os }}-${{ matrix.dotnet-version }}
+          path: ./TestResults/*.trx
+
+      - name: Upload coverage
+        if: always()
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-${{ matrix.os }}-${{ matrix.dotnet-version }}
+          path: ./TestResults/*.coverage
+
+  publish-results:
+    name: Publish Test Results
+    needs: test
+    runs-on: ubuntu-latest
+    if: always()
+
+    steps:
+      - name: Download all test results
+        uses: actions/download-artifact@v4
+        with:
+          pattern: test-results-*
+          path: ./TestResults
+
+      - name: Publish test results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        with:
+          files: ./TestResults/**/*.trx

.gitignore

@@ -681,4 +681,6 @@ fabric.properties
 ### VisualStudio Patch ###
 # Additional files built by Visual Studio
 
-# End of https://www.toptal.com/developers/gitignore/api/rider,csharp,dotnetcore,visualstudio
+# End of https://www.toptal.com/developers/gitignore/api/rider,csharp,dotnetcore,visualstudio
+
+*.g.cs

HyPlayer.NeteaseApi/ApiContracts/Album/AlbumApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Album;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;

HyPlayer.NeteaseApi/ApiContracts/Album/AlbumDetailDynamicApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Album;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;
 
 namespace HyPlayer.NeteaseApi.ApiContracts

HyPlayer.NeteaseApi/ApiContracts/Album/AlbumSublistApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Album;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 

HyPlayer.NeteaseApi/ApiContracts/Album/AlbumSubscribeApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Album;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;
 
 namespace HyPlayer.NeteaseApi.ApiContracts

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistAlbumsApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Artist;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistDetailApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Artist;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 
@@ -53,14 +53,15 @@ public class ArtistDetailDto
             [JsonPropertyName("name")] public string? Name { get; set; }
             [JsonPropertyName("alias")] public string[]? Alias { get; set; }
             [JsonPropertyName("followed")] public bool Followed { get; set; }
-            [JsonPropertyName("cover")] public string? PicUrl { get; set; }
-            [JsonPropertyName("avatar")] public string? Img1v1Url { get; set; }
+            [JsonPropertyName("picUrl")] public string? PicUrl { get; set; }
+            [JsonPropertyName("img1v1Url")] public string? Img1v1Url { get; set; }
             [JsonPropertyName("briefDesc")] public string? BriefDesc { get; set; }
             [JsonPropertyName("trans")] public string? Translation { get; set; }
             [JsonPropertyName("musicSize")] public int MusicSize { get; set; }
             [JsonPropertyName("albumSize")] public int AlbumSize { get; set; }
             [JsonPropertyName("mvSize")] public int MvSize { get; set; }
             [JsonPropertyName("transNames")] public string[]? TransNames { get; set; }
+            [JsonPropertyName("accountId")] public string? AccountId { get; set; }
         }
     }
 

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistSongsApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Artist;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistSublistApi.cs

@@ -3,6 +3,7 @@
 using HyPlayer.NeteaseApi.Bases.ApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
+using HyPlayer.NeteaseApi.Bases.WeApiContractBases;
 
 namespace HyPlayer.NeteaseApi.ApiContracts
 {

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistTopSongApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Artist;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 

HyPlayer.NeteaseApi/ApiContracts/Artist/ArtistVideoApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Artist;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -40,7 +40,7 @@ public override Task MapRequest(ApiHandlerOption option)
                     ArtistId = Request.ArtistId,
                     Tab = Request.Tab,
                     Order = Request.Order,
-                    Page = JsonSerializer.Serialize(page)
+                    Page = JsonSerializer.Serialize(page, ApiHandlerOption.JsonSerializerOptionsOnlyTypeInfo)
                 };
             }
 

HyPlayer.NeteaseApi/ApiContracts/Cloud/CloudDeleteApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;
 
 namespace HyPlayer.NeteaseApi.ApiContracts

HyPlayer.NeteaseApi/ApiContracts/Cloud/CloudGetApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 

HyPlayer.NeteaseApi/ApiContracts/Cloud/CloudPubApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 

HyPlayer.NeteaseApi/ApiContracts/Cloud/CloudUploadCheck.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;
 
 namespace HyPlayer.NeteaseApi.ApiContracts

HyPlayer.NeteaseApi/ApiContracts/Cloud/CloudUploadCoverTokenAllocApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;
 
 namespace HyPlayer.NeteaseApi.ApiContracts

HyPlayer.NeteaseApi/ApiContracts/Cloud/CloudUploadInfoApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 

HyPlayer.NeteaseApi/ApiContracts/Cloud/CloudUploadTokenAllocApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.RawApiContractBases;
 using System.Text.Json.Serialization;
 
 namespace HyPlayer.NeteaseApi.ApiContracts

HyPlayer.NeteaseApi/ApiContracts/Cloud/NeteaseUploadLoadBalancerGetApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.RawApiContractBases;
 using System.Text.Json.Serialization;
 
 namespace HyPlayer.NeteaseApi.ApiContracts

HyPlayer.NeteaseApi/ApiContracts/Cloud/UserCloudApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 

HyPlayer.NeteaseApi/ApiContracts/Cloud/UserCloudDelete.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Cloud;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using System.Text.Json.Serialization;
 
 namespace HyPlayer.NeteaseApi.ApiContracts
@@ -16,7 +16,7 @@ public static partial class NeteaseApis
 
 namespace HyPlayer.NeteaseApi.ApiContracts.Cloud
 {
-    public class UserCloudDeleteApi : EApiContractBase<IdOrIdListListRequest, UserCloudDeleteResponse, ErrorResultBase
+    public class UserCloudDeleteApi : EApiContractBase<UserCloudDeleteRequest,UserCloudDeleteResponse, ErrorResultBase
         , UserCloudDeleteActualRequest>
     {
         public override string IdentifyRoute => "/user/cloud/del";
@@ -36,6 +36,10 @@ public override Task MapRequest(ApiHandlerOption option)
         public override string ApiPath { get; protected set; } = "/api/cloud/del";
 
     }
+
+    public class UserCloudDeleteRequest : IdOrIdListListRequest
+    {
+    }
 
     public class UserCloudDeleteResponse : CodedResponseBase
     {

HyPlayer.NeteaseApi/ApiContracts/Comment/CommentFloorApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Comment;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Extensions;
 using HyPlayer.NeteaseApi.Models;
 using HyPlayer.NeteaseApi.Models.ResponseModels;

HyPlayer.NeteaseApi/ApiContracts/Comment/CommentLikeApi.cs

@@ -4,6 +4,7 @@
 using HyPlayer.NeteaseApi.Extensions;
 using HyPlayer.NeteaseApi.Models;
 using System.Text.Json.Serialization;
+using HyPlayer.NeteaseApi.Bases.WeApiContractBases;
 
 namespace HyPlayer.NeteaseApi.ApiContracts
 {

HyPlayer.NeteaseApi/ApiContracts/Comment/CommentsApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.Comment;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Extensions;
 using HyPlayer.NeteaseApi.Models;
 using HyPlayer.NeteaseApi.Models.ResponseModels;

HyPlayer.NeteaseApi/ApiContracts/DjChannel/DjChannelDetailApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.DjChannel;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;
 

HyPlayer.NeteaseApi/ApiContracts/DjChannel/DjChannelProgramsApi.cs

@@ -1,6 +1,6 @@
 using HyPlayer.NeteaseApi.ApiContracts.DjChannel;
 using HyPlayer.NeteaseApi.Bases;
-using HyPlayer.NeteaseApi.Bases.ApiContractBases;
+using HyPlayer.NeteaseApi.Bases.EApiContractBases;
 using HyPlayer.NeteaseApi.Models.ResponseModels;
 using System.Text.Json.Serialization;