Merge branch 'patch03' of https://github.com/lrisora/MusicPlayer2

zhongyang219 · Jul 2, 2024 · 5ff8d22 · 5ff8d22
2 parents 8591454 + 6b80bf7
commit 5ff8d22
Show file tree

Hide file tree

Showing 260 changed files with 16,649 additions and 17,432 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,2 @@
 MusicPlayer2/MusicPlayer2.rc text working-tree-encoding=UTF-16LE-BOM eol=CRLF
-
+scintilla/win32/ScintRes.rc text working-tree-encoding=UTF-16LE-BOM eol=CRLF
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -7,7 +7,7 @@ jobs:
     runs-on: windows-latest
     steps:
       - name: Check Out
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4
       # 所有版本链接：https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-history
       #- name: 下载 vs_enterprise.exe
       #  run: Invoke-WebRequest "https://aka.ms/vs/17/release/vs_enterprise.exe" -OutFile vs_enterprise.exe
@@ -24,30 +24,33 @@ jobs:
       #    "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
       #    "--add", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC"
       - name: 设置 msbuild
-        uses: microsoft/setup-msbuild@v1.3.1
+        uses: microsoft/setup-msbuild@v2
       - name: 编译
         run: msbuild -t:Build '-p:Configuration=Release;platform=x64' -m:4
+      - name: 复制文件到 Release 文件夹
+        run: cp -R ./MusicPlayer2/language/ ./x64/Release/
       - name: 上传文件
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
           name: MusicPlayer2.x64
           path: |
             ./x64/Release/*.exe
             ./x64/Release/*.dll
+            ./x64/Release/language/
       - name: 打包其他文件
         run: |
           cd x64/Release
           7z a -mx9 '../../MusicPlayer2.x64.other.7z' '-x!*.exe' '-x!*.dll' './*'
       - name: 上传其他文件
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
           name: MusicPlayer2.x64.other
           path: ./MusicPlayer2.x64.other.7z
   build-x86:
     runs-on: windows-latest
     steps:
       - name: Check Out
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4
       # 所有版本链接：https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-history
       #- name: 下载 vs_enterprise.exe
       #  run: Invoke-WebRequest "https://aka.ms/vs/17/release/vs_enterprise.exe" -OutFile vs_enterprise.exe
@@ -64,22 +67,25 @@ jobs:
       #    "--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
       #    "--add", "Microsoft.VisualStudio.Component.VC.14.29.16.11.MFC"
       - name: 设置 msbuild
-        uses: microsoft/setup-msbuild@v1.3.1
+        uses: microsoft/setup-msbuild@v2
       - name: 编译
         run: msbuild -t:Build '-p:Configuration=Release;platform=x86' -m:4
+      - name: 复制文件到 Release 文件夹
+        run: cp -R ./MusicPlayer2/language/ ./Release/
       - name: 上传文件
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
           name: MusicPlayer2.x86
           path: |
             ./Release/*.exe
             ./Release/*.dll
+            ./Release/language/
       - name: 打包其他文件
         run: |
           cd Release
           7z a -mx9 './../MusicPlayer2.x86.other.7z' '-x!*.exe' '-x!*.dll' './*'
       - name: 上传其他文件
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4
         with:
           name: MusicPlayer2.x86.other
           path: ./MusicPlayer2.x86.other.7z
diff --git a/.gitignore b/.gitignore
@@ -291,3 +291,4 @@ __pycache__/
 *.sf2
 /MusicPlayer2/compile_time.txt
 /MusicPlayer2/skins/test.xml
+!/MusicPlayer2/language/*.ini