Merge pull request #1701 from DGP-Studio/develop

.github/workflows/alpha.yml

@@ -29,14 +29,7 @@ on:
 
 jobs:
   build:
-    runs-on: ${{ matrix.runner }}
-
-    strategy:
-      matrix:
-        runner:
-          - self-hosted
-          - windows-latest
-
+    runs-on: self-hosted
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -52,13 +45,55 @@ jobs:
         run: dotnet tool restore && dotnet cake
         env:
           VERSION_API_TOKEN: ${{ secrets.VERSION_API_TOKEN }}
+          CERTIFICATE: ${{ secrets.CERTIFICATE }}
+          PW: ${{ secrets.PW }}
+
+      - name: Upload signed msix
+        if: success() && github.event_name != 'pull_request'
+        uses: actions/upload-artifact@v4
+        with:
+          name: Snap.Hutao.Alpha-${{ steps.cake.outputs.version }}
+          path: ${{ github.workspace }}/src/output/Snap.Hutao.Alpha-${{ steps.cake.outputs.version }}.msix
 
-      - name: Sign Msix
+      - name: Add summary
         if: success() && github.event_name != 'pull_request'
         shell: pwsh
         run: |
-          [System.Convert]::FromBase64String("${{ secrets.CERTIFICATE }}") | Set-Content -AsByteStream temp.pfx
-          signtool.exe sign /debug /v /a /fd SHA256 /f temp.pfx /p ${{ secrets.PW }} ${{ github.workspace }}\src\output\Snap.Hutao.Alpha-${{ steps.cake.outputs.version }}.msix
+          $summary = "
+          > [!WARNING]
+          > 该版本是由 CI 程序自动打包生成的 `Alpha` 测试版本，**仅供开发者测试使用**
+
+          > [!TIP]
+          > 普通用户请[点击这里](https://github.com/DGP-Studio/Snap.Hutao/releases/latest/)下载最新的稳定版本
+
+          > [!IMPORTANT]
+          > 请注意，从 Snap Hutao Alpha 2023.12.21.3 开始，我们将使用全新的 CI 证书，原有的 Snap.Hutao.CI.cer 将在几天后过期停止使用。
+          >
+          > 请安装 [DGP_Studio_CA.crt](https://github.com/DGP-Automation/Hutao-Auto-Release/releases/download/certificate-ca/DGP_Studio_CA.crt) 到 `受信任的根证书颁发机构` 以安装测试版安装包
+          "
+
+          echo $summary >> $Env:GITHUB_STEP_SUMMARY
+  fallback_build:
+    runs-on: windows-latest
+    needs: build
+    if: failure()
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0
+
+      - name: Cake
+        id: cake
+        shell: pwsh
+        run: dotnet tool restore && dotnet cake
+        env:
+          VERSION_API_TOKEN: ${{ secrets.VERSION_API_TOKEN }}
+          CERTIFICATE: ${{ secrets.CERTIFICATE }}
+          PW: ${{ secrets.PW }}
 
       - name: Upload signed msix
         if: success() && github.event_name != 'pull_request'

build.cake

@@ -11,6 +11,9 @@ var version = "version";
 var repoDir = "repoDir";
 var outputPath = "outputPath";
 
+var pfxPath = "pfxPath";
+var pw = "pw";
+
 // Extension
 
 static ProcessArgumentBuilder AppendIf(this ProcessArgumentBuilder builder, string text, bool condition)
@@ -62,6 +65,11 @@ if (GitHubActions.IsRunningOnGitHubActions)
             }
         );
 
+        var certificateBase64 = HasEnvironmentVariable("CERTIFICATE") ? EnvironmentVariable("CERTIFICATE") : throw new Exception("Cannot find CERTIFICATE");
+        pw = HasEnvironmentVariable("PW") ? EnvironmentVariable("PW") : throw new Exception("Cannot find PW");
+        pfxPath = System.IO.Path.Combine(repoDir, "temp.pfx");
+        System.IO.File.WriteAllBytes(pfxPath, System.Convert.FromBase64String(certificateBase64));
+
         Information($"Version: {version}");
     }
 
@@ -88,10 +96,19 @@ else // Local
     Information($"Version: {version}");
 }
 
+// Windows SDK
+var registry = new WindowsRegistry();
+var winsdkRegistry = registry.LocalMachine.OpenKey(@"SOFTWARE\Microsoft\Windows Kits\Installed Roots");
+var winsdkVersion = winsdkRegistry.GetSubKeyNames().MaxBy(key => int.Parse(key.Split(".")[2]));
+var winsdkPath = (string)winsdkRegistry.GetValue("KitsRoot10");
+var winsdkBinPath = System.IO.Path.Combine(winsdkPath, "bin", winsdkVersion, "x64");
+Information($"Windows SDK: {winsdkPath}");
+
 Task("Build")
     .IsDependentOn("Build binary package")
     .IsDependentOn("Copy files")
-    .IsDependentOn("Build MSIX");
+    .IsDependentOn("Build MSIX")
+    .IsDependentOn("Sign");
 
 Task("NuGet Restore")
     .Does(() =>
@@ -207,16 +224,58 @@ Task("Build MSIX")
     {
         arguments = "pack /d " + binPath + " /p " + System.IO.Path.Combine(outputPath, $"Snap.Hutao.Local-{version}.msix");
     }
+
+    var makeappxPath = System.IO.Path.Combine(winsdkBinPath, "makeappx.exe");
+
     var p = StartProcess(
-        "makeappx.exe",
+        makeappxPath,
         new ProcessSettings
         {
             Arguments = arguments
         }
     );
     if (p != 0)
     {
-        throw new InvalidOperationException("Build failed with exit code " + p);
+        throw new InvalidOperationException("Build MSIX failed with exit code " + p);
+    }
+});
+
+Task("Sign")
+    .IsDependentOn("Build MSIX")
+    .Does(() =>
+{
+    if (AppVeyor.IsRunningOnAppVeyor)
+    {
+        Information("Move to SignPath. Skip signing.");
+        return;
+    }
+    else if (GitHubActions.IsRunningOnGitHubActions)
+    {
+        if (GitHubActions.Environment.PullRequest.IsPullRequest)
+        {
+            Information("Is Pull Request. Skip signing.");
+            return;
+        }
+
+        var signPath = System.IO.Path.Combine(winsdkBinPath, "signtool.exe");
+        var arguments = $"sign /debug /v /a /fd SHA256 /f {pfxPath} /p {pw} {System.IO.Path.Combine(outputPath, $"Snap.Hutao.Alpha-{version}.msix")}";
+
+        var p = StartProcess(
+            signPath,
+            new ProcessSettings
+            {
+                Arguments = arguments
+            }
+        );
+        if (p != 0)
+        {
+            throw new InvalidOperationException("Sign failed with exit code " + p);
+        }
+    }
+    else
+    {
+        Information("Local configuration. Skip signing.");
+        return;
     }
 });
 

src/Snap.Hutao/Snap.Hutao.Test/IncomingFeature/SpiralAbyssScheduleIdTest.cs

@@ -6,14 +6,25 @@ namespace Snap.Hutao.Test.IncomingFeature;
 public class SpiralAbyssScheduleIdTest
 {
     private static readonly TimeSpan Utc8 = new(8, 0, 0);
+    private static readonly DateTimeOffset AcrobaticsBattleIntroducedTime = new(2024, 7, 1, 4, 0, 0, Utc8);
 
     [TestMethod]
     public void Test()
     {
         Console.WriteLine($"当前第 {GetForDateTimeOffset(DateTimeOffset.Now)} 期");
 
-        DateTimeOffset dateTimeOffset = new(2020, 7, 1, 4, 0, 0, Utc8);
-        Console.WriteLine($"2020-07-01 04:00:00 为第 {GetForDateTimeOffset(dateTimeOffset)} 期");
+        // 2020-07-01 04:00:00 为第 1 期
+        // 2024-06-16 04:00:00 为第 96 期
+        // 2024-07-01 04:00:00 为第 97 期
+        // 2024-07-16 04:00:00 为第 98 期
+        // 2024-08-01 04:00:00 为第 99 期
+        Console.WriteLine($"2020-07-01 04:00:00 为第 {GetForDateTimeOffset(new(2020, 07, 01, 4, 0, 0, Utc8))} 期");
+        Console.WriteLine($"2024-06-16 04:00:00 为第 {GetForDateTimeOffset(new(2024, 06, 16, 4, 0, 0, Utc8))} 期");
+        Console.WriteLine($"2024-07-01 04:00:00 为第 {GetForDateTimeOffset(new(2024, 07, 01, 4, 0, 0, Utc8))} 期");
+        Console.WriteLine($"2024-07-16 04:00:00 为第 {GetForDateTimeOffset(new(2024, 07, 16, 4, 0, 0, Utc8))} 期");
+        Console.WriteLine($"2024-08-01 04:00:00 为第 {GetForDateTimeOffset(new(2024, 08, 01, 4, 0, 0, Utc8))} 期");
+        Console.WriteLine($"2024-08-16 04:00:00 为第 {GetForDateTimeOffset(new(2024, 08, 16, 4, 0, 0, Utc8))} 期");
+        Console.WriteLine($"2024-09-01 04:00:00 为第 {GetForDateTimeOffset(new(2024, 09, 01, 4, 0, 0, Utc8))} 期");
     }
 
     public static int GetForDateTimeOffset(DateTimeOffset dateTimeOffset)
@@ -38,6 +49,12 @@ public static int GetForDateTimeOffset(DateTimeOffset dateTimeOffset)
             periodNum--;
         }
 
+        if (dateTimeOffset >= AcrobaticsBattleIntroducedTime)
+        {
+            // 当超过 96 期时，每一个月一期
+            periodNum = (4 * 12 * 2) + ((periodNum - (4 * 12 * 2)) / 2);
+        }
+
         return periodNum;
     }
 }

src/Snap.Hutao/Snap.Hutao.Test/RuntimeBehavior/HttpClientBehaviorTest.cs

@@ -0,0 +1,45 @@
+using System.Drawing;
+using System.Net.Http;
+using System.Net.Http.Json;
+using System.Runtime.CompilerServices;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace Snap.Hutao.Test.RuntimeBehavior;
+
+[TestClass]
+public sealed class HttpClientBehaviorTest
+{
+    private const int MessageNotYetSent = 0;
+
+    [TestMethod]
+    public async Task RetrySendHttpRequestMessage()
+    {
+        using (HttpClient httpClient = new())
+        {
+            HttpRequestMessage requestMessage = new(HttpMethod.Post, "https://jsonplaceholder.typicode.com/posts");
+            JsonContent content = JsonContent.Create(new Point(12, 34));
+            requestMessage.Content = content;
+            using (requestMessage)
+            {
+                await httpClient.SendAsync(requestMessage).ConfigureAwait(false);
+            }
+
+            Interlocked.Exchange(ref GetPrivateSendStatus(requestMessage), MessageNotYetSent);
+            Volatile.Write(ref GetPrivateDisposed(content), false);
+            await httpClient.SendAsync(requestMessage).ConfigureAwait(false);
+        }
+    }
+
+    // private int _sendStatus
+    [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_sendStatus")]
+    private static extern ref int GetPrivateSendStatus(HttpRequestMessage message);
+
+    // private bool _disposed
+    [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_disposed")]
+    private static extern ref bool GetPrivateDisposed(HttpRequestMessage message);
+
+    // private bool _disposed
+    [UnsafeAccessor(UnsafeAccessorKind.Field, Name = "_disposed")]
+    private static extern ref bool GetPrivateDisposed(HttpContent content);
+}

src/Snap.Hutao/Snap.Hutao.Test/Snap.Hutao.Test.csproj

@@ -13,9 +13,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
     <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

src/Snap.Hutao/Snap.Hutao/App.xaml.cs

@@ -59,7 +59,7 @@ public App(IServiceProvider serviceProvider)
 
     public new void Exit()
     {
-        XamlWindowLifetime.ApplicationExiting = true;
+        XamlLifetime.ApplicationExiting = true;
         base.Exit();
     }
 
@@ -72,6 +72,7 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
 
             if (serviceProvider.GetRequiredService<PrivateNamedPipeClient>().TryRedirectActivationTo(activatedEventArgs))
             {
+                logger.LogDebug("Application exiting on RedirectActivationTo");
                 Exit();
                 return;
             }
@@ -80,12 +81,19 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
             LogDiagnosticInformation();
 
             // Manually invoke
-            activation.Activate(HutaoActivationArguments.FromAppActivationArguments(activatedEventArgs));
+            HutaoActivationArguments hutaoArgs = HutaoActivationArguments.FromAppActivationArguments(activatedEventArgs);
+            if (hutaoArgs.Kind is HutaoActivationKind.Toast)
+            {
+                Exit();
+                return;
+            }
+
+            activation.Activate(hutaoArgs);
             activation.PostInitialization();
         }
         catch (Exception ex)
         {
-            Debug.WriteLine(ex);
+            logger.LogError(ex, "Application failed in App.OnLaunched");
             Process.GetCurrentProcess().Kill();
         }
     }