Merge main to Plan-UI-SI

.github/workflows/auto-build.yml

@@ -1,101 +1,100 @@
 name: auto-build
 
 on:
-  schedule:
-    - cron: '0 6 * * 0'
+    schedule:
+        - cron: "0 6 * * 0"
 
 jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [win, linux, osx]
-        arch: [x86, x64, arm, arm64]
-        exclude:
-          - os: osx
-            arch: x86
-          - os: osx
-            arch: arm
-          - os: linux
-            arch: x86
-
-    runs-on: windows-latest
-
-    steps:
-
-    - uses: actions/checkout@v3
-      with:
-        repository: 'Crequency/KitX'
-        ref: 'dev=main'
-        submodules: 'true'
-
-    - name: Init Source Code
-      shell: pwsh
-      run: |
-        ./ToolKits/start.ps1 dashboard
-        ./ToolKits/start.ps1 reference
-
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 6.0.x
-
-    - name: Filter Publish Profiles
-      shell: pwsh
-      working-directory: "KitX Dashboard"
-      run: |
-        cd "./Properties/PublishProfiles/"
-
-        echo "===== Origin Publish Profiles ====="
-
-        ls
-
-        cd ..
-        mkdir tmp
-
-        cp PublishProfiles/${{ matrix.os }}-${{ matrix.arch }}*.pubxml tmp/
-
-        rm PublishProfiles/*
-
-        cp tmp/* PublishProfiles/
-
-        echo "===== Filter Publish Profiles ====="
-
-        ls PublishProfiles
-
-    - name: Publish
-      shell: pwsh
-      run: |
-        cd "ToolKits"
-        cd "KitX.ToolKits.Publisher"
-
-        echo "===== Run command: `dotnet run` ====="
-
-        dotnet run
-
-        echo "===== `dotnet run` command done ====="
-
-        $version = (Get-Item -path "..\..\KitX Publish\kitx-${{ matrix.os }}-${{ matrix.arch }}-single\KitX Dashboard.dll").VersionInfo.FileVersion
-        $date = (Get-Date -Format "yyyy.MM.dd")
-
-        echo "version: $version"
-        echo "date: $date"
-
-        # echo "version=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
-        # echo "date=$date" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
-
-        echo "version=$version" >> $env:GITHUB_ENV
-        echo "date=$date" >> $env:GITHUB_ENV
-
-        cd ../../
-
-    - name: Create Release and Upload Release Asset
-      uses: softprops/action-gh-release@v1
-      with:
-        tag_name: v${{ env.version }}
-        name: Auto Build for KitX v${{ env.version }} on ${{ env.date }}
-        body: Auto release by Actions.
-        draft: false
-        prerelease: true
-        files: |
-          KitX Publish/*.zip
+    build:
+        strategy:
+            fail-fast: false
+            matrix:
+                os: [win, linux, osx]
+                arch: [x86, x64, arm, arm64]
+                exclude:
+                    - os: osx
+                      arch: x86
+                    - os: osx
+                      arch: arm
+                    - os: linux
+                      arch: x86
+
+        runs-on: windows-latest
+
+        steps:
+            - uses: actions/checkout@v3
+              with:
+                  repository: "Crequency/KitX"
+                  ref: "dev=main"
+                  submodules: "true"
+
+            - name: Init Source Code
+              shell: pwsh
+              run: |
+                  ./ToolKits/start.ps1 dashboard
+                  ./ToolKits/start.ps1 reference
+
+            - name: Setup .NET
+              uses: actions/setup-dotnet@v3
+              with:
+                  dotnet-version: 6.0.x
+
+            - name: Filter Publish Profiles
+              shell: pwsh
+              working-directory: "KitX Clients/KitX Dashboard/KitX Dashboard"
+              run: |
+                  cd "./Properties/PublishProfiles/"
+
+                  echo "===== Origin Publish Profiles ====="
+
+                  ls
+
+                  cd ..
+                  mkdir tmp
+
+                  cp PublishProfiles/${{ matrix.os }}-${{ matrix.arch }}*.pubxml tmp/
+
+                  rm PublishProfiles/*
+
+                  cp tmp/* PublishProfiles/
+
+                  echo "===== Filter Publish Profiles ====="
+
+                  ls PublishProfiles
+
+            - name: Publish
+              shell: pwsh
+              run: |
+                  cd "ToolKits"
+                  cd "KitX.ToolKits.Publisher"
+
+                  echo "===== Run command: `dotnet run` ====="
+
+                  dotnet run
+
+                  echo "===== `dotnet run` command done ====="
+
+                  $version = (Get-Item -path "..\..\KitX Publish\kitx-${{ matrix.os }}-${{ matrix.arch }}-single\KitX Dashboard.dll").VersionInfo.FileVersion
+                  $date = (Get-Date -Format "yyyy.MM.dd")
+
+                  echo "version: $version"
+                  echo "date: $date"
+
+                  # echo "version=$version" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+                  # echo "date=$date" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+
+                  echo "version=$version" >> $env:GITHUB_ENV
+                  echo "date=$date" >> $env:GITHUB_ENV
+
+                  cd ../../
+
+            - name: Create Release and Upload Release Asset
+              uses: softprops/action-gh-release@v1
+              with:
+                  tag_name: v${{ env.version }}
+                  name: Auto Build for KitX v${{ env.version }} on ${{ env.date }}
+                  body: Auto release by Actions.
+                  draft: false
+                  prerelease: true
+                  files: |
+                      KitX Publish/*.zip

KitX Dashboard Assets/KitX.Dashboard.Assets.csproj

@@ -0,0 +1,58 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>Library</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
+        <TrimMode>copyused</TrimMode>
+        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    </PropertyGroup>
+    <ItemGroup>
+      <None Remove="KitX-Icon-1024x-margin-2x.png" />
+      <None Remove="KitX-Icon-1024x.png" />
+      <None Remove="KitX-Icon-128x.png" />
+      <None Remove="KitX-Icon-1920x-margin-1x.png" />
+      <None Remove="KitX-Icon-1920x-margin-2x.png" />
+      <None Remove="KitX-Icon-1920x.png" />
+      <None Remove="KitX-Icon-256x-margin-2x.png" />
+      <None Remove="KitX-Icon-256x.png" />
+      <None Remove="KitX-Icon-256x256.png" />
+      <None Remove="KitX-Icon-32x.png" />
+      <None Remove="KitX-Icon-32x32.png" />
+      <None Remove="KitX-Icon-512x-margin-2x.png" />
+      <None Remove="KitX-Icon-512x.png" />
+      <None Remove="KitX-Icon-64x64.png" />
+    </ItemGroup>
+    <ItemGroup>
+      <AvaloniaResource Include="KitX-Icon-1024x-margin-2x.png" />
+      <AvaloniaResource Include="KitX-Icon-1024x.png" />
+      <AvaloniaResource Include="KitX-Icon-128x.png" />
+      <AvaloniaResource Include="KitX-Icon-1920x-margin-1x.png" />
+      <AvaloniaResource Include="KitX-Icon-1920x-margin-2x.png" />
+      <AvaloniaResource Include="KitX-Icon-1920x.png" />
+      <AvaloniaResource Include="KitX-Icon-256x-margin-2x.png" />
+      <AvaloniaResource Include="KitX-Icon-256x.png" />
+      <AvaloniaResource Include="KitX-Icon-256x256.png" />
+      <AvaloniaResource Include="KitX-Icon-32x.png" />
+      <AvaloniaResource Include="KitX-Icon-512x-margin-2x.png" />
+      <AvaloniaResource Include="KitX-Icon-512x.png" />
+    </ItemGroup>
+    <ItemGroup>
+      <AvaloniaResource Include="KitX-Icon-32x32.png" />
+      <AvaloniaResource Include="KitX-Icon-64x64.png" />
+    </ItemGroup>
+    <ItemGroup>
+        <!--This helps with theme dll-s trimming.
+    If you will publish your application in self-contained mode with p:PublishTrimmed=true and it will use Fluent theme Default theme will be trimmed from the output and vice versa.
+    https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
+        <TrimmableAssembly Include="Avalonia.Themes.Fluent" />
+        <TrimmableAssembly Include="Avalonia.Themes.Default" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Avalonia" Version="0.10.18" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
+        <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
+    </ItemGroup>
+</Project>

KitX Dashboard Fonts/KitX.Dashboard.Fonts.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <OutputType>Library</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <!--Avalonia doesen't support TrimMode=link currently,but we are working on that https://github.com/AvaloniaUI/Avalonia/issues/6892 -->
+        <TrimMode>copyused</TrimMode>
+        <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
+    </PropertyGroup>
+    <ItemGroup>
+        <None Remove="sarasa-mono-cl-regular.ttf" />
+        <None Remove="SourceHanSans-VF.ttf" />
+    </ItemGroup>
+    <ItemGroup>
+        <AvaloniaResource Include="sarasa-mono-cl-regular.ttf" />
+        <AvaloniaResource Include="SourceHanSans-VF.ttf" />
+    </ItemGroup>
+    <ItemGroup>
+        <!--This helps with theme dll-s trimming.
+    If you will publish your application in self-contained mode with p:PublishTrimmed=true and it will use Fluent theme Default theme will be trimmed from the output and vice versa.
+    https://github.com/AvaloniaUI/Avalonia/issues/5593 -->
+        <TrimmableAssembly Include="Avalonia.Themes.Fluent" />
+        <TrimmableAssembly Include="Avalonia.Themes.Default" />
+    </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Avalonia" Version="0.10.18" />
+        <PackageReference Include="Avalonia.Desktop" Version="0.10.18" />
+        <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
+        <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="0.10.18" />
+        <PackageReference Include="XamlNameReferenceGenerator" Version="1.5.1" />
+    </ItemGroup>
+</Project>

KitX Dashboard Repair Tool/KitX.Dashboard.RepairTool.csproj

@@ -0,0 +1,11 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <PublishAot>true</PublishAot>
+    </PropertyGroup>
+
+</Project>

KitX Dashboard Repair Tool/Program.cs

@@ -0,0 +1,57 @@
+
+var tip_copyright = () =>
+{
+    Console.WriteLine(
+        $"""
+        KitX Repair Tool (C) Crequency
+        Environment: {Environment.Version}
+        OS Version: {Environment.OSVersion}
+        """);
+};
+
+var log_exception = (Exception e) =>
+{
+    Console.WriteLine(e.Message);
+    Console.WriteLine(e.StackTrace);
+};
+
+T? ask<T>(string tip = "Input: ", Func<string?, T>? parse = null)
+{
+    Console.Write(tip);
+    string? input = Console.ReadLine();
+    if (input is null) return default(T);
+    if (parse is not null) return parse(input);
+    else throw new Exception(input);
+};
+
+var menu = () =>
+{
+    Console.WriteLine(
+        """
+        1. (root) Linux wayland repair (add `LC_ALL=C` to environment variables)
+        """);
+    return ask("Your select: ", x => int.TryParse(x, out int y) ? y : -1);
+};
+
+tip_copyright();
+switch (menu())
+{
+    case 1:
+        if (!OperatingSystem.IsLinux())
+        {
+            Console.WriteLine("Only on linux.");
+            break;
+        }
+        try
+        {
+            File.AppendAllLines("/etc/environment", new string[] { "LC_ALL=C" });
+        }
+        catch (Exception e)
+        {
+            log_exception(e);
+        }
+        break;
+    default:
+        break;
+}
+

KitX Dashboard Updater/KitX.Dashboard.Updater.csproj

@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Common.Update.Replacer" Version="1.0.1.2" />
+    </ItemGroup>
+
+</Project>