Merge pull request #3354 from CombatExtended-Continued/Update-Workflo…

…ws-for-new-Loader

Update Workflows for new Loader

.github/workflows/duplicates.yml

@@ -0,0 +1,20 @@
+name: Check Patch Duplicates
+on:
+  pull_request:
+    branches: [ master, Development ]
+
+# Restrict the permissions of the ephemeral GitHub token used by this workflow
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        fetch-depth: 0
+    - name: Check for duplicate virtual file paths
+      run: |
+        python3 DupeFinder.py -c

.github/workflows/main.yml

@@ -15,12 +15,10 @@ jobs:
         rm -rf AssemblyPublicizer
         git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
         mkdir -p Assemblies
-        mkdir -p AssembliesCore
-        mkdir -p AssembliesCompat
         mkdir -p ${{ runner.temp }}/downloads
-    - name: build loader
+    - name: remove loader
       run: |
-        TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs
+        rm Assemblies/CombatExtendedLoader.dll
         
     - name: build core
       run: |
@@ -33,7 +31,7 @@ jobs:
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Source/ Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Source/ Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r build.zip CombatExtended
     - name: Upload to DO
       run: |

.github/workflows/pullrequest.yml

@@ -25,15 +25,13 @@ jobs:
         wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/Make.py -O Make.py
         wget https://raw.githubusercontent.com/CombatExtended-Continued/CombatExtended/Development/BuildCompat.py -O BuildCompat.py
         mkdir -p Assemblies
-        mkdir -p AssembliesCore
-        mkdir -p AssembliesCompat
         mkdir -p ${{ runner.temp }}/downloads
         rm -rf AssemblyPublicizer
         git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
         
-    - name: build loader
+    - name: remove loader
       run: |
-        TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs
+        rm Assemblies/CombatExtendedLoader.dll
         
     - name: build core
       run: |
@@ -46,7 +44,7 @@ jobs:
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Source/ Assemblies/ AssembliesCompat/ AssembliesCore/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Source/ Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r build.zip CombatExtended
     - name: Upload to DO
       run: |

.github/workflows/release.yml

@@ -16,13 +16,11 @@ jobs:
         rm -rf AssemblyPublicizer
         git clone https://github.com/CombatExtended-Continued/AssemblyPublicizer
         mkdir -p Assemblies
-        mkdir -p AssembliesCore
-        mkdir -p AssembliesCompat
         mkdir -p ${{ runner.temp }}/downloads
         
-    - name: build loader
+    - name: remove loader
       run: |
-        TEMP=${{ runner.temp }}/ python Make.py --csproj Source/Loader/Loader.csproj --output Assemblies/0CombatExtendedLoader.dll --download-libs --all-libs        
+        rm Assemblies/CombatExtendedLoader.dll
     - name: build core
       run: |
         TEMP=${{ runner.temp }}/ python Make.py --csproj Source/CombatExtended/CombatExtended.csproj --output Assemblies/CombatExtended.dll --download-libs --all-libs --publicizer $PWD/AssemblyPublicizer
@@ -32,7 +30,7 @@ jobs:
     - name: package
       run: |
         mkdir CombatExtended
-        cp -r Assemblies/ AssembliesCore/ AssembliesCompat/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
+        cp -r Assemblies/ About/ Defs/ Languages/ Patches/ Royalty/ Ideology/ Biotech/ Anomaly/ Sounds/ Textures/ ModPatches/ LoadFolders.xml README.md SupportedThirdPartyMods.md CombatExtended
         zip -9 -r CombatExtended.zip CombatExtended
     - name: Upload Package
       id: upload-package