Merge branch 'master' into master

This commit is contained in:
wolfcomp 2023-01-10 22:47:33 +01:00 committed by GitHub
commit 323aae7858
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
53 changed files with 2083 additions and 1198 deletions

View file

@ -69,9 +69,7 @@ jobs:
$branchName = "stg"
}
$dllBytes = [System.IO.File]::ReadAllBytes("$(Get-Location)\scratch\Dalamud.dll")
$assembly = [System.Reflection.Assembly]::Load($dllBytes)
$newVersion = $assembly.GetCustomAttributes([System.Reflection.AssemblyMetadataAttribute]) | Where { $_.GetType() -eq [System.Reflection.AssemblyMetadataAttribute] } | Select -First 1 | Select -ExpandProperty "Value"
$newVersion = [System.IO.File]::ReadAllText("$(Get-Location)\scratch\TEMP_gitver.txt")
Remove-Item -Force -Recurse .\scratch
if (Test-Path -Path $branchName) {