From 3a6b690c880297b24cffb9f0b43d5ecc94c2ea48 Mon Sep 17 00:00:00 2001 From: Katy Coe Date: Wed, 25 Nov 2020 13:20:56 +0100 Subject: [PATCH] PS: Make il2cpp.ps1 compatible with PowerShell 7.x (#92) --- Il2CppTests/il2cpp.ps1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Il2CppTests/il2cpp.ps1 b/Il2CppTests/il2cpp.ps1 index c10f71e..ad98eaf 100644 --- a/Il2CppTests/il2cpp.ps1 +++ b/Il2CppTests/il2cpp.ps1 @@ -234,7 +234,7 @@ gci "$asm/*" -Include $dll | % { $name = $_.Name echo "Running bytecode stripper on $name..." - & $stripper "--out=$asm/$($_.BaseName)-stripped", "--i18n=none", "--core-action=link", ` + & $stripper "--out=$asm/$($_.BaseName)-stripped" "--i18n=none" "--core-action=link" ` "--include-assembly=$_,$mscorlib" $stripperAdditionalArguments } @@ -244,7 +244,7 @@ gci "$asm/*" -Include $dll | % { $name = $_.BaseName echo "Converting assembly $($_.Name) to C++..." rm -Force -Recurse $cpp/$name 2>&1 >$null - & $il2cpp $cppArg "--generatedcppdir=$cpp/$name", "--assembly=$asm/$($_.BaseName)-stripped/$($_.Name)", "--copy-level=None" >$null + & $il2cpp $cppArg "--generatedcppdir=$cpp/$name" "--assembly=$asm/$($_.BaseName)-stripped/$($_.Name)" "--copy-level=None" >$null } # Run IL2CPP on all generated assemblies for both x86 and ARM @@ -254,7 +254,7 @@ function Do-IL2CPP-Build { [string] $Platform, [string] $Architecture, [string] $Name, - $AdditionalArgs + [string[]] $AdditionalArgs ) # Determine target name @@ -268,9 +268,9 @@ function Do-IL2CPP-Build { md $bin/$TargetBaseName 2>&1 >$null md $bin/$TargetBaseName/cache 2>&1 >$null - & $il2cpp $compileArg $AdditionalArgs "--platform=$Platform", "--architecture=$Architecture", ` - "--outputpath=$bin/$TargetBaseName/$TargetBaseName.$ext", ` - "--generatedcppdir=$cpp/$Name", ` + & $il2cpp $compileArg $AdditionalArgs "--platform=$Platform" "--architecture=$Architecture" ` + "--outputpath=$bin/$TargetBaseName/$TargetBaseName.$ext" ` + "--generatedcppdir=$cpp/$Name" ` "--cachedirectory=$bin/$TargetBaseName/cache" >$null if ($LastExitCode -ne 0) {