From ee49be751e95e82a16093ec155724ba892998b98 Mon Sep 17 00:00:00 2001
From: WMHN <1872265132@qq.com>
Date: Fri, 29 Mar 2024 19:56:34 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E9=9D=9E=E5=95=86?=
 =?UTF-8?q?=E5=BA=97=E6=9D=A5=E6=BA=90=E6=8F=92=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 6d9e457..47fa62b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -90,36 +90,36 @@ jobs:
     strategy:
       matrix:
         addon:
-          - addonId: AiSound5
+          - Name: AiSound5
             URL: https://dl.nvdacn.com/NVDA-Addons/New/AISound5.nvda-addon
             sha256: B67640578F524471B38098B45E8F7BA1C9E80EA407D5D6147E3B511AD9614AFA
             addonVersionName: '23.04'
-          - addonId: DragAndDrop
+          - Name: DragAndDrop
             URL: https://github.com/javidominguez/DragAndDrop/releases/download/2.2dev/DragAndDrop-2.2dev.nvda-addon
             sha256: F7056F62968C1F432D99641E030AD58A8BF49EDF3A7975205F65015D5A334679
             addonVersionName: 2.2dev
-          - addonId: IBMTTS
+          - Name: IBMTTS
             URL: https://dl.nvdacn.com/NVDA-Addons/New/IBMTTS-23.12.1.nvda-addon
             sha256: F96353B0329FB66319FC98B5748AB9D03C2A236762CF29F3B99EBACD04635451
             addonVersionName: 23.12.1
-          - addonId: numberProcessing
+          - Name: numberProcessing
             URL: https://github.com/ABuffEr/numberProcessing/releases/download/20230310-dev/numberProcessing-20230310-dev.nvda-addon
             sha256: E57468DD9A995E087EB1F9A7A140C6303EC518292DE9D2185316FDC3CAD6FA8B
             addonVersionName: 20230310-dev
-          - addonId: WorldVoice
+          - Name: WorldVoice
             URL: https://github.com/tsengwoody/WorldVoice/releases/download/v3.7/WorldVoice-3.7.nvda-addon
             sha256: 8E25B0741769E6C84B2964D9701E0BE174605C795C3515524A6036C570AE35A9
             addonVersionName: 3.7
     steps:
-      - name: Cache ${{ matrix.addon.addonId }}-${{ matrix.addon.addonVersionName }} Addon
+      - name: Cache ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }} Addon
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/*.nvda-addon
-          key: ${{ matrix.addon.addonId }}-${{ matrix.addon.addonVersionName }}-${{ matrix.addon.sha256 }}
+          key: ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }}-${{ matrix.addon.sha256 }}
           restore-keys: |
-            ${{ matrix.addon.addonId }}-${{ matrix.addon.addonVersionName }}.nvda-addon
+            ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }}.nvda-addon
           enableCrossOsArchive: true
-      - name: Download ${{ matrix.addon.addonId }}-${{ matrix.addon.addonVersionName }} Addon
+      - name: Download ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }} Addon
         id: download-addon
         uses: carlosperate/download-file-action@v2
         with:
@@ -127,7 +127,7 @@ jobs:
           sha256: ${{ matrix.addon.sha256 }}
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.addon.addonId }}-${{ matrix.addon.addonVersionName }}.nvda-addon
+          name: ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }}.nvda-addon
           path: ${{ steps.download-addon.outputs.file-path }}
           if-no-files-found: error
 

From 0a071e6d99d35cdba2bfa6f7ce81bf68503e8803 Mon Sep 17 00:00:00 2001
From: WMHN <1872265132@qq.com>
Date: Fri, 29 Mar 2024 20:01:50 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=B2=BE=E7=AE=80=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yaml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 47fa62b..eeabf2a 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -93,33 +93,33 @@ jobs:
           - Name: AiSound5
             URL: https://dl.nvdacn.com/NVDA-Addons/New/AISound5.nvda-addon
             sha256: B67640578F524471B38098B45E8F7BA1C9E80EA407D5D6147E3B511AD9614AFA
-            addonVersionName: '23.04'
+            Version: '23.04'
           - Name: DragAndDrop
             URL: https://github.com/javidominguez/DragAndDrop/releases/download/2.2dev/DragAndDrop-2.2dev.nvda-addon
             sha256: F7056F62968C1F432D99641E030AD58A8BF49EDF3A7975205F65015D5A334679
-            addonVersionName: 2.2dev
+            Version: 2.2dev
           - Name: IBMTTS
             URL: https://dl.nvdacn.com/NVDA-Addons/New/IBMTTS-23.12.1.nvda-addon
             sha256: F96353B0329FB66319FC98B5748AB9D03C2A236762CF29F3B99EBACD04635451
-            addonVersionName: 23.12.1
+            Version: 23.12.1
           - Name: numberProcessing
             URL: https://github.com/ABuffEr/numberProcessing/releases/download/20230310-dev/numberProcessing-20230310-dev.nvda-addon
             sha256: E57468DD9A995E087EB1F9A7A140C6303EC518292DE9D2185316FDC3CAD6FA8B
-            addonVersionName: 20230310-dev
+            Version: 20230310-dev
           - Name: WorldVoice
             URL: https://github.com/tsengwoody/WorldVoice/releases/download/v3.7/WorldVoice-3.7.nvda-addon
             sha256: 8E25B0741769E6C84B2964D9701E0BE174605C795C3515524A6036C570AE35A9
-            addonVersionName: 3.7
+            Version: 3.7
     steps:
-      - name: Cache ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }} Addon
+      - name: Cache ${{ matrix.addon.Name }}-${{ matrix.addon.Version }} Addon
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/*.nvda-addon
-          key: ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }}-${{ matrix.addon.sha256 }}
+          key: ${{ matrix.addon.Name }}-${{ matrix.addon.Version }}-${{ matrix.addon.sha256 }}
           restore-keys: |
-            ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }}.nvda-addon
+            ${{ matrix.addon.Name }}-${{ matrix.addon.Version }}.nvda-addon
           enableCrossOsArchive: true
-      - name: Download ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }} Addon
+      - name: Download ${{ matrix.addon.Name }}-${{ matrix.addon.Version }} Addon
         id: download-addon
         uses: carlosperate/download-file-action@v2
         with:
@@ -127,7 +127,7 @@ jobs:
           sha256: ${{ matrix.addon.sha256 }}
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.addon.Name }}-${{ matrix.addon.addonVersionName }}.nvda-addon
+          name: ${{ matrix.addon.Name }}-${{ matrix.addon.Version }}.nvda-addon
           path: ${{ steps.download-addon.outputs.file-path }}
           if-no-files-found: error
 

From 7caed8f6ac73526b554026031470a296a2d8097e Mon Sep 17 00:00:00 2001
From: WMHN <1872265132@qq.com>
Date: Fri, 29 Mar 2024 20:09:18 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yaml | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index eeabf2a..a06d275 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -90,36 +90,31 @@ jobs:
     strategy:
       matrix:
         addon:
-          - Name: AiSound5
+          - Name: AiSound5-23.04
             URL: https://dl.nvdacn.com/NVDA-Addons/New/AISound5.nvda-addon
             sha256: B67640578F524471B38098B45E8F7BA1C9E80EA407D5D6147E3B511AD9614AFA
-            Version: '23.04'
-          - Name: DragAndDrop
+          - Name: DragAndDrop-2.2dev
             URL: https://github.com/javidominguez/DragAndDrop/releases/download/2.2dev/DragAndDrop-2.2dev.nvda-addon
             sha256: F7056F62968C1F432D99641E030AD58A8BF49EDF3A7975205F65015D5A334679
-            Version: 2.2dev
-          - Name: IBMTTS
+          - Name: IBMTTS-23.12.1
             URL: https://dl.nvdacn.com/NVDA-Addons/New/IBMTTS-23.12.1.nvda-addon
             sha256: F96353B0329FB66319FC98B5748AB9D03C2A236762CF29F3B99EBACD04635451
-            Version: 23.12.1
-          - Name: numberProcessing
+          - Name: numberProcessing20230310-dev
             URL: https://github.com/ABuffEr/numberProcessing/releases/download/20230310-dev/numberProcessing-20230310-dev.nvda-addon
             sha256: E57468DD9A995E087EB1F9A7A140C6303EC518292DE9D2185316FDC3CAD6FA8B
-            Version: 20230310-dev
-          - Name: WorldVoice
+          - Name: WorldVoice-3.7
             URL: https://github.com/tsengwoody/WorldVoice/releases/download/v3.7/WorldVoice-3.7.nvda-addon
             sha256: 8E25B0741769E6C84B2964D9701E0BE174605C795C3515524A6036C570AE35A9
-            Version: 3.7
     steps:
-      - name: Cache ${{ matrix.addon.Name }}-${{ matrix.addon.Version }} Addon
+      - name: Cache ${{ matrix.addon.Name }} Addon
         uses: actions/cache@v4
         with:
           path: ${{ github.workspace }}/*.nvda-addon
-          key: ${{ matrix.addon.Name }}-${{ matrix.addon.Version }}-${{ matrix.addon.sha256 }}
+          key: ${{ matrix.addon.Name }}-${{ matrix.addon.sha256 }}
           restore-keys: |
-            ${{ matrix.addon.Name }}-${{ matrix.addon.Version }}.nvda-addon
+            ${{ matrix.addon.Name }}.nvda-addon
           enableCrossOsArchive: true
-      - name: Download ${{ matrix.addon.Name }}-${{ matrix.addon.Version }} Addon
+      - name: Download ${{ matrix.addon.Name }} Addon
         id: download-addon
         uses: carlosperate/download-file-action@v2
         with:
@@ -127,7 +122,7 @@ jobs:
           sha256: ${{ matrix.addon.sha256 }}
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.addon.Name }}-${{ matrix.addon.Version }}.nvda-addon
+          name: ${{ matrix.addon.Name }}.nvda-addon
           path: ${{ steps.download-addon.outputs.file-path }}
           if-no-files-found: error
 

From c6b4cc567f8045ff796e1409d9e76ff48b4f1f0e Mon Sep 17 00:00:00 2001
From: WMHN <1872265132@qq.com>
Date: Fri, 29 Mar 2024 20:21:18 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E5=AD=97?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E6=8F=92=E4=BB=B6=E7=89=88=E6=9C=AC=E5=88=86?=
 =?UTF-8?q?=E9=9A=94=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index a06d275..17375c3 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -99,7 +99,7 @@ jobs:
           - Name: IBMTTS-23.12.1
             URL: https://dl.nvdacn.com/NVDA-Addons/New/IBMTTS-23.12.1.nvda-addon
             sha256: F96353B0329FB66319FC98B5748AB9D03C2A236762CF29F3B99EBACD04635451
-          - Name: numberProcessing20230310-dev
+          - Name: numberProcessing-20230310-dev
             URL: https://github.com/ABuffEr/numberProcessing/releases/download/20230310-dev/numberProcessing-20230310-dev.nvda-addon
             sha256: E57468DD9A995E087EB1F9A7A140C6303EC518292DE9D2185316FDC3CAD6FA8B
           - Name: WorldVoice-3.7