Workflows attempt 6

.github/workflows/build.yml

@@ -2,8 +2,9 @@ name: Windows Build
 
 on:
   push:
-    branches:
-      - master
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 env:
   # Path to the solution file relative to the root of the project.
@@ -26,7 +27,7 @@ jobs:
     - name: Add MSBuild to PATH
       uses: microsoft/[email protected]
 
-    - name: Restore NuGet packages
+    - name: Restore NuGet Packages
       working-directory: ${{env.GITHUB_WORKSPACE}}
       run: nuget restore ${{env.SOLUTION_FILE_PATH}}
 
@@ -36,16 +37,12 @@ jobs:
       # See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
       run: msbuild /m /p:Configuration=${{matrix.configuration}} ${{env.SOLUTION_FILE_PATH}}
 
-    - name: Upload artifacts
+    - name: Prepare Artifacts
+      working-directory: ${{env.GITHUB_WORKSPACE}}
+      run: .\DALTools\Scripts\PrepareArtifacts.bat ${{matrix.configuration}}
+
+    - name: Upload Artifacts
       uses: actions/[email protected]
       with:
         name: DALTools-${{matrix.configuration}}
-        path:  |
-          DALTools\DALLib\bin\${{matrix.configuration}}\*DALLib.dll
-          DALTools\PCKTool\bin\${{matrix.configuration}}\*PCKTool.exe
-          DALTools\STSCTool\bin\${{matrix.configuration}}\*STSCTool.exe
-          DALTools\TEXTool\bin\${{matrix.configuration}}\*TEXTool.exe
-          DALTools\FontEditor\bin\${{matrix.configuration}}\*FontEditor.exe
-          DALTools\ScriptDatabaseEditor\bin\${{matrix.configuration}}\*ScriptDatabaseEditor.exe
-          DALTools\ScriptDialogueEditor\bin\${{matrix.configuration}}\*ScriptDialogueEditor.exe
-          DALTools\TableEditor\bin\${{matrix.configuration}}\*TableEditor.exe
+        path: ${{env.GITHUB_WORKSPACE}}\Artifacts

Scripts/PrepareArtifacts.bat

@@ -0,0 +1,9 @@
+mkdir .\Artifacts
+copy .\DALTools\DALTools\DALLib\bin\%1\DALLib.dll .\Artifacts\DALLib.dll
+copy .\DALTools\DALTools\PCKTool\bin\%1\PCKTool.exe .\Artifacts\PCKTool.exe
+copy .\DALTools\DALTools\STSCTool\bin\%1\STSCTool.exe .\Artifacts\STSCTool.exe
+copy .\DALTools\DALTools\TEXTool\bin\%1\TEXTool.exe .\Artifacts\TEXTool.exe
+copy .\DALTools\DALTools\FontEditor\bin\%1\FontEditor.exe .\Artifacts\FontEditor.exe
+copy .\DALTools\DALTools\ScriptDatabaseEditor\bin\%1\ScriptDatabaseEditor.exe .\Artifacts\ScriptDatabaseEditor.exe
+copy .\DALTools\DALTools\ScriptDialogueEditor\bin\%1\ScriptDialogueEditor.exe .\Artifacts\ScriptDialogueEditor.exe
+copy .\DALTools\DALTools\TableEditor\bin\%1\TableEditor.exe .\Artifacts\TableEditor.exe