unified gh actions releases, added version to file info

.github/workflows/msbuild.yml

@@ -32,16 +32,26 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@main
 
+    - name: Auto Increment Version
+      uses: MCKanpolat/auto-semver-action@v1
+      id: versioning
+      with:
+        releaseType: minor 
+        incrementPerCommit: false
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+
     - name: Configure build
-      run: ./premake5.bat
+      run: ./premake5 vs2022 --with-version=${{ steps.versioning.outputs.version }}
 
     - name: Build
       run: |
         msbuild -m build/Ultimate-ASI-Loader-x64.sln /property:Configuration=Release /property:Platform=x64
         msbuild -m build/Ultimate-ASI-Loader-Win32.sln /property:Configuration=Release /property:Platform=Win32
 
     - name: Pack binaries
-      run: ./release.ps1
+      run: |
+        ./release.bat
+        ./release.ps1
 
     - name: Upload artifact (Win32)
       uses: actions/upload-artifact@v3
@@ -55,6 +65,20 @@ jobs:
         name: Ultimate-ASI-Loader-x64
         path: dist/x64/dll/*
 
+    - name: Upload Release (Main)
+      if: |
+        github.ref_name == 'master' &&
+        github.event_name == 'push' &&
+        github.repository == 'ThirteenAG/Ultimate-ASI-Loader'
+      uses: ncipollo/release-action@main
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        allowUpdates: false
+        name: Ultimate ASI Loader v${{ steps.versioning.outputs.version }}
+        bodyFile: "release.md"
+        tag: v${{ steps.versioning.outputs.version }}
+        artifacts: bin/Ultimate-ASI-Loader.zip, bin/Ultimate-ASI-Loader_x64.zip
+
     - name: Get release info (Win32)
       if: |
         github.ref_name == 'master' &&

appveyor.yml

@@ -43,8 +43,9 @@ deploy:
   auth_token:
     secure: ugbti+bXX/7zqu39OyiPxgRPd2pQn2FEV/12ABees2fHfpZob0tWXzqD/zSYmibJ
   artifact: Ultimate-ASI-Loader.zip, Ultimate-ASI-Loader_x64.zip
+  prerelease: false
   on:
-    branch: master
+    branch: undefined
 - provider: GitHub
   tag: demo-plugins
   release: Ultimate ASI Loader Demo Plugins
@@ -54,4 +55,4 @@ deploy:
   artifact: RE7Demo.InfiniteAmmo-x64.zip, MessageBox-x64.zip, OverloadFromFolderDLL-x64.zip, ExeUnprotect-Win32.zip, MessageBox-Win32.zip, OverloadFromFolderDLL-Win32.zip, MonoLoader-Win32.zip, MonoLoader-x64.zip
   force_update: true
   on:
-    branch: /^(master|monoloader)$/
+    branch: master

license

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 ThirteenAG
+Copyright (c) 2023 ThirteenAG
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

premake5.lua

@@ -1,3 +1,10 @@
+newoption {
+    trigger     = "with-version",
+    value       = "STRING",
+    description = "Current UAL version",
+    default     = "6.0.0",
+}
+
 -- x86
 workspace "Ultimate-ASI-Loader-Win32"
    configurations { "Release", "Debug" }
@@ -7,7 +14,11 @@ workspace "Ultimate-ASI-Loader-Win32"
 
    defines { "rsc_CompanyName=\"ThirteenAG\"" }
    defines { "rsc_LegalCopyright=\"MIT License\""} 
-   defines { "rsc_FileVersion=\"1.0.0.0\"", "rsc_ProductVersion=\"1.0.0.0\"" }
+   if(_OPTIONS["with-version"]) then
+      defines { "rsc_FileVersion=\"" .. _OPTIONS["with-version"] .. "\"", "rsc_ProductVersion=\"" .. _OPTIONS["with-version"] .. "\"" }
+   else
+      defines { "rsc_FileVersion=\"1.0.0.0\"", "rsc_ProductVersion=\"1.0.0.0\"" }
+   end
    defines { "rsc_InternalName=\"%{prj.name}\"", "rsc_ProductName=\"%{prj.name}\"", "rsc_OriginalFilename=\"%{prj.name}.dll\"" }
    defines { "rsc_FileDescription=\"Ultimate ASI Loader\"" }
    defines { "rsc_UpdateUrl=\"https://github.com/ThirteenAG/Ultimate-ASI-Loader\"" }
@@ -92,7 +103,7 @@ project "ExeUnprotect"
       defines { "NDEBUG" }
       optimize "On"
       staticruntime "On"
-	  
+      
 project "OverloadFromFolderDLL"
    kind "SharedLib"
    language "C++"
@@ -112,7 +123,32 @@ project "OverloadFromFolderDLL"
       defines { "NDEBUG" }
       optimize "On"
       staticruntime "On"
-
+
+project "MonoLoader"
+   kind "SharedLib"
+   language "C++"
+   targetdir "bin/Win32/%{cfg.buildcfg}/scripts"
+   targetextension ".asi"
+
+   files { "source/demo_plugins/MonoLoader.cpp" }
+   files { "source/resources/Versioninfo.rc" }
+
+   includedirs { "source/demo_plugins/minhook/include" }
+   includedirs { "source/demo_plugins/minhook/src" }
+
+   files { "source/demo_plugins/minhook/include/**" }
+   files { "source/demo_plugins/minhook/src/**" }
+
+   characterset ("UNICODE")
+
+   filter "configurations:Debug"
+      defines { "DEBUG" }
+      symbols "On"
+
+   filter "configurations:Release"
+      defines { "NDEBUG" }
+      optimize "On"
+      staticruntime "On"
 
 -- x64
 workspace "Ultimate-ASI-Loader-x64"
@@ -123,7 +159,11 @@ workspace "Ultimate-ASI-Loader-x64"
 
    defines { "rsc_CompanyName=\"ThirteenAG\"" }
    defines { "rsc_LegalCopyright=\"MIT License\""} 
-   defines { "rsc_FileVersion=\"1.0.0.0\"", "rsc_ProductVersion=\"1.0.0.0\"" }
+   if(_OPTIONS["with-version"]) then
+      defines { "rsc_FileVersion=\"" .. _OPTIONS["with-version"] .. "\"", "rsc_ProductVersion=\"" .. _OPTIONS["with-version"] .. "\"" }
+   else
+      defines { "rsc_FileVersion=\"1.0.0.0\"", "rsc_ProductVersion=\"1.0.0.0\"" }
+   end
    defines { "rsc_InternalName=\"%{prj.name}\"", "rsc_ProductName=\"%{prj.name}\"", "rsc_OriginalFilename=\"%{prj.name}.dll\"" }
    defines { "rsc_FileDescription=\"Ultimate ASI Loader\"" }
    defines { "rsc_UpdateUrl=\"https://github.com/ThirteenAG/Ultimate-ASI-Loader\"" }
@@ -194,7 +234,7 @@ project "MessageBox_x64"
       defines { "NDEBUG" }
       optimize "On"
       staticruntime "On"
-	  
+      
 project "OverloadFromFolderDLL_x64"
    kind "SharedLib"
    language "C++"
@@ -206,6 +246,32 @@ project "OverloadFromFolderDLL_x64"
 
    characterset ("UNICODE")
 
+   filter "configurations:Debug"
+      defines { "DEBUG" }
+      symbols "On"
+
+   filter "configurations:Release"
+      defines { "NDEBUG" }
+      optimize "On"
+      staticruntime "On"
+
+project "MonoLoader_x64"
+   kind "SharedLib"
+   language "C++"
+   targetdir "bin/x64/%{cfg.buildcfg}/scripts"
+   targetextension ".asi"
+
+   files { "source/demo_plugins/MonoLoader.cpp" }
+   files { "source/resources/Versioninfo.rc" }
+
+   includedirs { "source/demo_plugins/minhook/include" }
+   includedirs { "source/demo_plugins/minhook/src" }
+
+   files { "source/demo_plugins/minhook/include/**" }
+   files { "source/demo_plugins/minhook/src/**" }
+
+   characterset ("UNICODE")
+
    filter "configurations:Debug"
       defines { "DEBUG" }
       symbols "On"

release.bat

@@ -8,6 +8,8 @@ type nul >"bin\place both files in RESIDENT EVIL 7 biohazard Demo folder"
 7za a -tzip ".\bin\MessageBox-x64.zip" ".\bin\x64\Release\scripts\MessageBox_x64.asi"
 7za a -tzip ".\bin\OverloadFromFolderDLL-x64.zip" ".\bin\x64\Release\scripts\OverloadFromFolderDLL_x64.asi"
 7za a -tzip ".\bin\OverloadFromFolderDLL-Win32.zip" ".\bin\Win32\Release\scripts\OverloadFromFolderDLL.asi"
+7za a -tzip ".\bin\MonoLoader-Win32.zip" ".\bin\Win32\Release\scripts\MonoLoader.asi" ".\source\demo_plugins\plugins\"
+7za a -tzip ".\bin\MonoLoader-x64.zip" ".\bin\x64\Release\scripts\MonoLoader_x64.asi" ".\source\demo_plugins\plugins\"
 EXIT
 
 7-Zip Extra

release.md

@@ -0,0 +1,32 @@
+This is a DLL file which adds ASI plugin loading functionality to any game, which uses any of the following libraries:
+
+- [d3d8.dll](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/d3d8-Win32.zip) (x86)
+- d3d9.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/d3d9-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/d3d9-x64.zip))
+- d3d10.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/d3d10-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/d3d10-x64.zip))
+- d3d11.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/d3d11-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/d3d11-x64.zip))
+- d3d12.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/d3d12-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/d3d12-x64.zip))
+- [ddraw.dll](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/ddraw-Win32.zip) (x86)
+- [dinput.dll](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/dinput-Win32.zip) (x86)
+- dinput8.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/dinput8-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/dinput8-x64.zip))
+- dsound.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/dsound-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/dsound-x64.zip))
+- [msacm32.dll](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/msacm32-Win32.zip) (x86)
+- [msvfw32.dll](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/msvfw32-Win32.zip) (x86)
+- version.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/version-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/version-x64.zip))
+- wininet.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/wininet-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/wininet-x64.zip))
+- winmm.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/winmm-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/winmm-x64.zip))
+- winhttp.dll ([x86](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/winhttp-Win32.zip) and [x64](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/winhttp-x64.zip))
+- [xlive.dll](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/xlive-Win32.zip) (x86)
+- [binkw32.dll](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/binkw32-Win32.zip) (rename original to binkw32Hooked.dll, optional)
+- [bink2w64.dll](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/x64-latest/bink2w64-x64.zip) (rename original to bink2w64Hooked.dll)
+- [vorbisFile.dll](https://github.com/ThirteenAG/Ultimate-ASI-Loader/releases/download/Win32-latest/vorbisFile-Win32.zip) (rename original to vorbisHooked.dll, optional)
+
+With the last two, it is possible to load the original dll by renaming it to 'vorbisHooked.dll' or 'binkw32Hooked.dll'.
+Usually it is not required and you can simply replace the dll. Always make a backup before replacing any files.
+
+## INSTALLATION
+
+In order to install it, you just need to place DLL into game directory. Usually it works as dinput8.dll, but if it's not, there is a possibility to rename it(see the list of supported names above).
+
+## USAGE
+
+Put ASI files in game root directory, 'scripts' or 'plugins' folder.