From 0a87b56f3d8b4ade16e19644fc0754358d3e2e03 Mon Sep 17 00:00:00 2001
From: Zhenhuan Li <lizhenhuan1019@qq.com>
Date: Wed, 31 Aug 2022 22:15:28 +0800
Subject: [PATCH] Update workflow

---
 .github/resources/FileFilters.regexp | 11 +++++------
 .github/workflows/Build.yml          | 21 +++++++++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.github/resources/FileFilters.regexp b/.github/resources/FileFilters.regexp
index 2301f3c..c2e209b 100644
--- a/.github/resources/FileFilters.regexp
+++ b/.github/resources/FileFilters.regexp
@@ -1,6 +1,5 @@
-bin\\Win64_Shipping_Client\\(?<=\\)[^\\]*TaleWorlds.+
-Modules\\CustomBattle\\bin\\Win64_Shipping_Client\\(?<=\\)[^\\]+dll
-Modules\\SandBox\\bin\\Win64_Shipping_Client\\(?<=\\)[^\\]+dll
-Modules\\SandBoxCore\\bin\\Win64_Shipping_Client\\(?<=\\)[^\\]+dll
-Modules\\StoryMode\\bin\\Win64_Shipping_Client\\(?<=\\)[^\\]+dll
-bin\\Win64_Shipping_Client\\System.Numerics.Vectors.dll
\ No newline at end of file
+regex:bin/Win64_Shipping_Client/(?<=/)[^/]*TaleWorlds.+
+regex:Modules/CustomBattle/bin/Win64_Shipping_Client/(?<=/)[^/]+dll
+regex:Modules/SandBox/bin/Win64_Shipping_Client/(?<=/)[^/]+dll
+regex:Modules/SandBoxCore/bin/Win64_Shipping_Client/(?<=/)[^/]+dll
+regex:Modules/StoryMode/bin/Win64_Shipping_Client/(?<=/)[^/]+dll
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 0f4ea9e..506d53d 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -68,6 +68,12 @@ jobs:
         with:
           dotnet-version: '2.2.x'
 
+      # additional .net core for DepotDownloader.
+      - name: Setup .NET Core 6.0.x
+        uses: actions/setup-dotnet@master
+        with:
+          dotnet-version: '6.0.x'
+
       - name: setup-msbuild
         uses: microsoft/setup-msbuild@v1
         # with:
@@ -80,21 +86,24 @@ jobs:
         # uses: NuGet/setup-nuget@04b0c2b8d1b97922f67eca497d7cf0bf17b8ffe1
         uses: NuGet/setup-nuget@v1.0.5
           
-      - name: Download DepotDownloader_2.3.6
+      - name: Download DepotDownloader_2.4.7
         uses: i3h/download-release-asset@v1
         with:
           owner: SteamRE
           repo: DepotDownloader
-          tag: DepotDownloader_2.3.6
-          file: depotdownloader-2.3.6.zip
-      - name: Extract DepotDownloader_2.3.6
+          tag: DepotDownloader_2.4.7
+          file: depotdownloader-2.4.7.zip
+      - name: Extract DepotDownloader_2.4.7
         uses: DuckSoft/extract-7z-action@v1.0
         with:
-          pathSource: depotdownloader-2.3.6.zip
+          pathSource: depotdownloader-2.4.7.zip
           pathTarget: depotdownloader
 
-      - name: Download Bannerlord binaries
+      - name: Download Bannerlord binaries 1
         run: dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261551 -beta ${{steps.dotenv.outputs.game_version}} -username ${{secrets.STEAM_LOGIN}} -password ${{secrets.STEAM_PASSWORD}} -filelist ./.github/resources/FileFilters.regexp -dir bannerlord;
+
+      - name: Download Bannerlord binaries 2
+        run: dotnet depotdownloader/DepotDownloader.dll -app 261550 -depot 261552 -beta ${{steps.dotenv.outputs.game_version}} -username ${{secrets.STEAM_LOGIN}} -password ${{secrets.STEAM_PASSWORD}} -filelist ./.github/resources/FileFilters.regexp -dir bannerlord;
       
       - name: Build Solution
         run: >-