Merge remote-tracking branch 'upstream/main' into pr/BoredYukolin/5912

Author: SlimeSB

.github/workflows/packer.yml

@@ -8,6 +8,7 @@ on:
       - 'src/**'
       - 'config/packer/**'
       - 'projects/**'
+      - '.github/workflows/packer.yml'
 
 
 jobs:
@@ -28,14 +29,15 @@ jobs:
         with:
           key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
           path: |
-            Packer.exe
-            git2-*.dll
+            build/Packer.exe
+            build/git2-*.dll
           lookup-only: true
 
       # 构造程序
       - name: Build Packer if not cached
         if: steps.cache-packer.outputs.cache-hit != 'true'
-        run: dotnet publish .\src\Packer\Packer.csproj -o ./ -r win-x64
+        # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+        run: dotnet publish .\src\Packer\Packer.csproj -o ./build -r win-x64
 
   build-uploader:
     if: github.repository == 'CFPAOrg/Minecraft-Mod-Language-Package'
@@ -54,13 +56,14 @@ jobs:
         uses: actions/cache@v4
         with:
           key: ${{ runner.os }}-Uploader-${{ hashFiles('src/Uploader/**') }}
-          path: Uploader.exe
+          path: build/Uploader.exe
           lookup-only: true
 
       # 构造程序
       - name: Build Uploader if not cached
         if: steps.cache-uploader.outputs.cache-hit != 'true'
-        run: dotnet publish .\src\Uploader\Uploader.csproj -o ./ -r win-x64
+        # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+        run: dotnet publish .\src\Uploader\Uploader.csproj -o ./build -r win-x64
 
   pack:
     name: Pack Resources and Upload Artifacts/Releases
@@ -84,16 +87,21 @@ jobs:
         with:
           key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
           path: |
-            Packer.exe
-            git2-*.dll
+            build/Packer.exe
+            build/git2-*.dll
           fail-on-cache-miss: true # 应由前序保证
 
+      # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+      - run: mv ./build/* .
+        shell: bash
+
       - name: Check changed path on ${{ matrix.version }}
         uses: MarceloPrado/has-changed-path@v1.0
         id: check-changes
         with:
           # 判断位置：该版本文件、该版本配置、代码
           paths: > 
+            .github/workflows/packer.yml
             projects/${{ matrix.version }}
             config/packer/${{ matrix.version }}.json
             src/**
@@ -133,9 +141,13 @@ jobs:
         with:
           key: ${{ runner.os }}-Uploader-${{ hashFiles('src/Uploader/**') }}
           path: |
-            Uploader.exe
+            build/Uploader.exe
           fail-on-cache-miss: true # 应由前序保证
 
+      # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+      - run: mv ./build/* .
+        shell: bash
+
       # 还原artifact（资源包）
       - name: Restore Artifacts
         uses: actions/download-artifact@v4

.github/workflows/pr-packer.yml

@@ -32,14 +32,15 @@ jobs:
         with:
           key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
           path: |
-            Packer.exe
-            git2-*.dll
+            build/Packer.exe
+            build/git2-*.dll
           lookup-only: true
 
       # 构造程序
       - name: Build Packer if not cached
         if: steps.cache-packer.outputs.cache-hit != 'true'
-        run: dotnet publish .\src\Packer\Packer.csproj -o ./ -r win-x64
+        # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+        run: dotnet publish .\src\Packer\Packer.csproj -o ./build -r win-x64
 
 
   pack:
@@ -66,16 +67,21 @@ jobs:
         with:
           key: ${{ runner.os }}-Packer-${{ hashFiles('src/Packer/**') }}
           path: |
-            Packer.exe
-            git2-*.dll
+            build/Packer.exe
+            build/git2-*.dll
           fail-on-cache-miss: true # 前一步理应构造过的。如果不命中，肯定有问题，不如直接挂掉。
+      
+      # dotnet/sdk#51806 Console Projects fail to compile with <ArtifactsPath>$(MSBuildThisFileDirectory)
+      - run: mv ./build/* .
+        shell: bash
 
       - name: Check changed path on ${{ matrix.version }}
         uses: MarceloPrado/has-changed-path@v1.0
         id: check-changes
         with:
-          # 判断位置：该版本文件、该版本配置、代码
+          # 判断位置：action配置、该版本文件、该版本配置、代码
           paths: > 
+            .github/workflows/pr-packer.yml
             projects/${{ matrix.version }}/**
             config/packer/${{ matrix.version }}.json
             src/**
@@ -84,8 +90,9 @@ jobs:
         uses: MarceloPrado/has-changed-path@v1.0
         id: check-critical-changes
         with:
-          # 判断位置：该版本配置、代码
+          # 判断位置：action配置、该版本配置、代码
           paths: > 
+            .github/workflows/pr-packer.yml
             config/packer/${{ matrix.version }}.json
             src/**
 

.gitignore

@@ -1,6 +1,7 @@
 # CFPA-specifics
 Minecraft-Mod-Language-Package-*.zip
 *.md5
+build/
 Packer.exe
 Packer.xml
 

Packer-Doc.md

@@ -200,7 +200,6 @@
   - 在 `parameter` 中，有时会出现多于一组参数；这种情况下，每组参数都会自由组合。
   - 同样的，`templates` 也会和每一套参数自由组合。
 - 将所有组合后的条目汇总，生成语言文件。
-  - 在这一过程中，如果出现了**键冲突**，目前而言，**打包器会在此崩溃！** 不过，如果后续观察表明确实存在此种需要，也会考虑修改这一行为。
 
 组合文件可以和其他打包策略混合使用，以修改组合中效果不好的部分，或者添加非组合的内容。