Merge pull request #140 from ww-rm/dev/wpf

v0.16.10

.github/workflows/dotnet-release.yml

@@ -11,6 +11,10 @@ jobs:
   build-release:
     if: ${{ github.event.pull_request.merged == true }}
     runs-on: windows-latest
+    outputs:
+      version: ${{ steps.extract_version.outputs.version }}
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+
     env:
       PROJECT_NAME: SpineViewer
       PROJ_CLI_NAME: SpineViewerCLI
@@ -27,21 +31,15 @@ jobs:
           dotnet-version: "8.0.x"
 
       - name: Extract version from csproj
+        id: extract_version
         shell: pwsh
         run: |
           [xml]$proj = Get-Content "$env:PROJECT_NAME\$env:PROJECT_NAME.csproj"
           $VERSION_NUM = $proj.Project.PropertyGroup.Version
           $VERSION_TAG = "v$VERSION_NUM".Trim()
-          "VERSION=$VERSION_TAG" >> $env:GITHUB_ENV
+          echo "Version tag found: $VERSION_TAG"
-
+          echo "version=$VERSION_TAG" >> $env:GITHUB_OUTPUT
-      - name: Check Version Tag
+          echo "VERSION=$VERSION_TAG" >> $env:GITHUB_ENV
-        shell: pwsh
-        run: |
-          if (-not $env:VERSION) {
-            Write-Error "Version tag not found in csproj file."
-            exit 1
-          }
-          Write-Host "Version tag found: $env:VERSION"
 
       - name: Tag merge commit
         shell: pwsh
@@ -63,19 +61,11 @@ jobs:
           dotnet publish "$env:PROJECT_NAME\$env:PROJECT_NAME.csproj" -c Release -r win-x64 --sc true -o "publish\$env:PROJECT_NAME-$env:VERSION-SelfContained"
           dotnet publish "$env:PROJ_CLI_NAME\$env:PROJ_CLI_NAME.csproj" -c Release -r win-x64 --sc true -o "publish\$env:PROJECT_NAME-$env:VERSION-SelfContained"
 
-      - name: Create release directory
+      - name: Compress Windows builds
         shell: pwsh
         run: |
           New-Item -ItemType Directory -Path release -Force | Out-Null
-
-      - name: Compress FrameworkDependent version
-        shell: pwsh
-        run: |
           Compress-Archive -Path "publish\$env:PROJECT_NAME-$env:VERSION\*" -DestinationPath "release\$env:PROJECT_NAME-$env:VERSION.zip" -Force
-
-      - name: Compress SelfContained version
-        shell: pwsh
-        run: |
           Compress-Archive -Path "publish\$env:PROJECT_NAME-$env:VERSION-SelfContained\*" -DestinationPath "release\$env:PROJECT_NAME-$env:VERSION-SelfContained.zip" -Force
 
       - name: Create GitHub Release
@@ -89,7 +79,7 @@ jobs:
           draft: false
           prerelease: false
 
-      - name: Upload FrameworkDependent zip
+      - name: Upload Windows FrameworkDependent zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -99,7 +89,7 @@ jobs:
           asset_name: ${{ env.PROJECT_NAME }}-${{ env.VERSION }}.zip
           asset_content_type: application/zip
 
-      - name: Upload SelfContained zip
+      - name: Upload Windows SelfContained zip
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -108,3 +98,43 @@ jobs:
           asset_path: release/${{ env.PROJECT_NAME }}-${{ env.VERSION }}-SelfContained.zip
           asset_name: ${{ env.PROJECT_NAME }}-${{ env.VERSION }}-SelfContained.zip
           asset_content_type: application/zip
+
+
+  build-release-linux:
+    needs: build-release
+    if: ${{ github.event.pull_request.merged == true }}
+    runs-on: ubuntu-latest
+    env:
+      PROJ_CLI_NAME: SpineViewerCLI
+      VERSION: ${{ needs.build-release.outputs.version }}
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-tags: true
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: "8.0.x"
+
+      - name: Publish Linux SelfContained version
+        run: |
+          dotnet publish "$PROJ_CLI_NAME/$PROJ_CLI_NAME.csproj" -c Release -r linux-x64 --sc true -o "publish/${PROJ_CLI_NAME}-${VERSION}-Linux-SelfContained"
+
+      - name: Compress Linux build
+        run: |
+          mkdir -p release
+          cd publish
+          zip -r "../release/${PROJ_CLI_NAME}-${VERSION}-Linux-SelfContained.zip" "${PROJ_CLI_NAME}-${VERSION}-Linux-SelfContained"
+
+      - name: Upload Linux zip to GitHub Release
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.build-release.outputs.upload_url }}
+          asset_path: release/${{ env.PROJ_CLI_NAME }}-${{ env.VERSION }}-Linux-SelfContained.zip
+          asset_name: ${{ env.PROJ_CLI_NAME }}-${{ env.VERSION }}-Linux-SelfContained.zip
+          asset_content_type: application/zip

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v0.16.10
+
+- 增加 Linux 平台 CLI 工具构建
+
 ## v0.16.9
 
 - 重构 CLI 工具

NLog.Windows.Wpf/NLog.Windows.Wpf.csproj

@@ -4,6 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
+        <PlatformTarget>x64</PlatformTarget>
         <TargetFramework>net8.0-windows</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>

SFMLRenderer/SFMLRenderer.csproj

@@ -4,6 +4,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
+        <PlatformTarget>x64</PlatformTarget>
         <TargetFramework>net8.0-windows</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>

Spine/Spine.csproj

@@ -4,10 +4,11 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <Version>0.16.9</Version>
+        <Version>0.16.10</Version>
     </PropertyGroup>
 
     <PropertyGroup>
@@ -21,6 +22,10 @@
         <PackageReference Include="SkiaSharp" Version="3.119.0" />
     </ItemGroup>
 
+    <ItemGroup Condition="'$(RuntimeIdentifier)' == 'linux-x64' Or '$(RuntimeIdentifier)' == 'linux-arm64'">
+        <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="3.119.0" />
+    </ItemGroup>
+
     <ItemGroup>
       <ProjectReference Include="..\SpineRuntimes\SpineRuntime21\SpineRuntime21.csproj" />
       <ProjectReference Include="..\SpineRuntimes\SpineRuntime34\SpineRuntime34.csproj" />

Spine/Utils/SFMLShader.cs

@@ -14,7 +14,7 @@ namespace Spine.Utils
         /// </summary>
         private const string FRAGMENT_VertexAlpha = 
             "uniform sampler2D t;" +
-            "void main() { vec4 p = texture(t, gl_TexCoord[0].xy);" +
+            "void main() { vec4 p = texture2D(t, gl_TexCoord[0].xy);" +
             "p.rgb *= p.a * gl_Color.a;" +
             "gl_FragColor = gl_Color * p; }"
         ;
@@ -24,7 +24,7 @@ namespace Spine.Utils
         /// </summary>
         private const string FRAGMENT_VertexAlphaPma = 
             "uniform sampler2D t;" +
-            "void main() { vec4 p = texture(t, gl_TexCoord[0].xy);" +
+            "void main() { vec4 p = texture2D(t, gl_TexCoord[0].xy);" +
             "p.rgb *= gl_Color.a;" +
             "gl_FragColor = gl_Color * p; }"
         ;
@@ -34,8 +34,8 @@ namespace Spine.Utils
         /// </summary>
         private const string FRAGMENT_InvPma = 
             "uniform sampler2D t;" +
-            "void main() { vec4 p = texture(t, gl_TexCoord[0].xy);" +
+            "void main() { vec4 p = texture2D(t, gl_TexCoord[0].xy);" +
-            "if (p.a > 0) p.rgb /= max(max(max(p.r, p.g), p.b), p.a);" +
+            "if (p.a > 0.0) p.rgb /= max(max(max(p.r, p.g), p.b), p.a);" +
             "gl_FragColor = p; }"
         ;
 

SpineRuntimes/SpineRuntime21/SpineRuntime21.csproj

@@ -4,7 +4,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <Version>2.1.25</Version>

SpineRuntimes/SpineRuntime34/SpineRuntime34.csproj

@@ -4,7 +4,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <Version>3.4.2</Version>

SpineRuntimes/SpineRuntime35/SpineRuntime35.csproj

@@ -4,7 +4,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <Version>3.5.51</Version>

SpineRuntimes/SpineRuntime36/SpineRuntime36.csproj

@@ -4,7 +4,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <Version>3.6.53</Version>

SpineRuntimes/SpineRuntime37/SpineRuntime37.csproj

@@ -4,7 +4,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <Version>3.7.94</Version>

SpineRuntimes/SpineRuntime38/SpineRuntime38.csproj

@@ -4,7 +4,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <Version>3.8.99</Version>

SpineRuntimes/SpineRuntime40/SpineRuntime40.csproj

@@ -4,7 +4,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <Version>4.0.64</Version>

SpineRuntimes/SpineRuntime41/SpineRuntime41.csproj

@@ -4,7 +4,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <Version>4.1.54</Version>

SpineRuntimes/SpineRuntime42/SpineRuntime42.csproj

@@ -4,7 +4,8 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <Version>4.2.74</Version>

SpineViewer/App.xaml.cs

@@ -86,6 +86,7 @@ namespace SpineViewer
                 Encoding = System.Text.Encoding.UTF8,
                 Layout = "${date:format=yyyy-MM-dd HH\\:mm\\:ss} - ${level:uppercase=true} - ${processid} - ${callsite-filename:includeSourcePath=false}:${callsite-linenumber} - ${message}",
                 AutoFlush = true,
+                CreateDirs = true,
                 FileName = "${basedir}/logs/app.log",
                 ArchiveFileName = "${basedir}/logs/app.{#}.log",
                 ArchiveNumbering = NLog.Targets.ArchiveNumberingMode.Rolling,

SpineViewer/SpineViewer.csproj

@@ -4,10 +4,11 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
+        <PlatformTarget>x64</PlatformTarget>
         <TargetFramework>net8.0-windows</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <Version>0.16.9</Version>
+        <Version>0.16.10</Version>
         <OutputType>WinExe</OutputType>
         <UseWPF>true</UseWPF>
     </PropertyGroup>

SpineViewerCLI/SpineViewerCLI.cs

@@ -5,11 +5,14 @@ using Spine;
 using Spine.Exporters;
 using System.CommandLine;
 using System.Globalization;
+using System.Runtime.InteropServices;
 
 namespace SpineViewerCLI
 {
     public static class SpineViewerCLI
     {
+        private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
+
         public static Option<bool> OptQuiet { get; } = new("--quiet", "-q")
         {
             Description = "Suppress console logging (quiet mode).",
@@ -33,17 +36,28 @@ namespace SpineViewerCLI
             if (!result.GetValue(OptQuiet))
                 InitializeConsoleLog();
 
-            return result.Invoke();
+            try
+            {
+                return result.Invoke();
+            }
+            catch (Exception ex)
+            {
+                _logger.Trace(ex.ToString());
+                _logger.Fatal("Failed to execute, {0}", ex.Message);
+                return -1;
+            }
         }
 
         private static void InitializeFileLog()
         {
+            // XXX: δ֪ԭ<D6AA><D4AD> linux ƽ̨<C6BD><CCA8><EFBFBD>޷<EFBFBD><DEB7><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>־<EFBFBD>ļ<EFBFBD>
             var config = new NLog.Config.LoggingConfiguration();
             var fileTarget = new NLog.Targets.FileTarget("fileTarget")
             {
                 Encoding = System.Text.Encoding.UTF8,
                 Layout = "${date:format=yyyy-MM-dd HH\\:mm\\:ss} - ${level:uppercase=true} - ${processid} - ${callsite-filename:includeSourcePath=false}:${callsite-linenumber} - ${message}",
                 AutoFlush = true,
+                CreateDirs = true,
                 FileName = "${basedir}/logs/cli.log",
                 ArchiveFileName = "${basedir}/logs/cli.{#}.log",
                 ArchiveNumbering = NLog.Targets.ArchiveNumberingMode.Rolling,
@@ -71,13 +85,15 @@ namespace SpineViewerCLI
                 DetectOutputRedirected = true,
             };
 
+            consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Trace", NLog.Targets.ConsoleOutputColor.DarkGray, NLog.Targets.ConsoleOutputColor.NoChange));
+            consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Debug", NLog.Targets.ConsoleOutputColor.DarkGray, NLog.Targets.ConsoleOutputColor.NoChange));
             consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Info", NLog.Targets.ConsoleOutputColor.DarkGray, NLog.Targets.ConsoleOutputColor.NoChange));
             consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Warn", NLog.Targets.ConsoleOutputColor.DarkYellow, NLog.Targets.ConsoleOutputColor.NoChange));
             consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Error", NLog.Targets.ConsoleOutputColor.Red, NLog.Targets.ConsoleOutputColor.NoChange));
             consoleTarget.RowHighlightingRules.Add(new("level == LogLevel.Fatal", NLog.Targets.ConsoleOutputColor.White, NLog.Targets.ConsoleOutputColor.DarkRed));
 
             config.AddTarget(consoleTarget);
-            config.AddRule(LogLevel.Info, LogLevel.Fatal, consoleTarget);
+            config.AddRule(LogLevel.Trace, LogLevel.Fatal, consoleTarget);
             LogManager.Configuration = config;
         }
     }

SpineViewerCLI/SpineViewerCLI.csproj

@@ -4,10 +4,11 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <Platforms>x64</Platforms>
-        <TargetFramework>net8.0-windows</TargetFramework>
+        <PlatformTarget>x64</PlatformTarget>
+        <TargetFramework>net8.0</TargetFramework>
         <BaseOutputPath>$(SolutionDir)out</BaseOutputPath>
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
-        <Version>0.16.9</Version>
+        <Version>0.16.10</Version>
         <OutputType>Exe</OutputType>
     </PropertyGroup>
 
@@ -22,7 +23,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\SFMLRenderer\SFMLRenderer.csproj" />
         <ProjectReference Include="..\Spine\Spine.csproj" />
     </ItemGroup>