Skip to content

Commit b884722

Browse files
yukieijiyukieiji
committed
feat:new assm
1 parent 3628fc1 commit b884722

File tree

4 files changed

+34
-9
lines changed

4 files changed

+34
-9
lines changed

‎build.ps1

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,24 @@ Remove-Item $Path/UnityExplorer.Standalone.IL2CPP.pdb
221221
Remove-Item $Path/../UnityExplorer.Standalone.IL2CPP.zip -ErrorAction SilentlyContinue
222222
compress-archive .\$Path\* $Path/../UnityExplorer.Standalone.IL2CPP.zip
223223

224+
# ----------- Standalone IL2CPP CoreCLR -----------
225+
dotnet build src/UnityExplorer.sln -c Release_STANDALONE_Cpp_CoreCLR
226+
$Path = "Release/UnityExplorer.Standalone.IL2CPP.CoreCLR"
227+
# ILRepack
228+
lib/ILRepack.exe /target:library /lib:lib/net6/ /lib:lib/interop/ /lib:$Path /internalize /out:$Path/UnityExplorer.Standalone.IL2CPP.CoreCLR.dll $Path/UnityExplorer.Standalone.IL2CPP.CoreCLR.dll $Path/mcs.dll $Path/Tomlet.dll
229+
# (cleanup and move files)
230+
Remove-Item $Path/Tomlet.dll
231+
Remove-Item $Path/mcs.dll
232+
Remove-Item $Path/Iced.dll
233+
Remove-Item $Path/Il2CppInterop.Common.dll
234+
Remove-Item $Path/Il2CppInterop.Runtime.dll
235+
Remove-Item $Path/Microsoft.Extensions.Logging.Abstractions.dll
236+
Remove-Item $Path/UnityExplorer.Standalone.IL2CPP.CoreCLR.pdb
237+
Remove-Item $Path/UnityExplorer.Standalone.IL2CPP.CoreCLR.deps.json
238+
Remove-Item $Path/../UnityExplorer.Standalone.IL2CPP.CoreCLR.zip -ErrorAction SilentlyContinue
239+
compress-archive .\$Path\* $Path/../UnityExplorer.Standalone.IL2CPP.CoreCLR.zip
240+
241+
224242
# ----------- Editor (mono) -----------
225243
$Path1 = "Release/UnityExplorer.Standalone.Mono"
226244
$Path2 = "UnityEditorPackage/Runtime"

‎src/Loader/Standalone/ExplorerStandalone.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88
using UnityEngine.EventSystems;
99
using UniverseLib.Input;
1010
using UnityExplorer.Loader.Standalone;
11-
#if CPP
12-
using UnhollowerRuntimeLib;
13-
#endif
1411

1512
namespace UnityExplorer
1613
{
@@ -39,7 +36,7 @@ public string ExplorerFolderDestination
3936
}
4037
}
4138
protected static string explorerFolderDest;
42-
39+
4340
Action<object> IExplorerLoader.OnLogMessage => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Log); };
4441
Action<object> IExplorerLoader.OnLogWarning => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Warning); };
4542
Action<object> IExplorerLoader.OnLogError => (object log) => { OnLog?.Invoke(log?.ToString() ?? "", LogType.Error); };

‎src/UnityExplorer.csproj

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@
1313
<RootNamespace>UnityExplorer</RootNamespace>
1414
<!-- MSBuildの.NET8対応に伴って勝手にバージョンにハッシュ値入れられてBepInExのロード不具合が出たため、明示的に無効化しておく -->
1515
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
16-
<Configurations>BIE_Cpp;BIE_Cpp_CoreCLR;BIE_Unity_Cpp_CoreCLR;BIE5_Mono;BIE6_Mono;BIE6_Unity_Mono;ML_Cpp_net6;ML_Cpp_CoreCLR;ML_Cpp_net472;ML_Mono;STANDALONE_Mono;STANDALONE_Cpp</Configurations>
16+
<Configurations>BIE_Cpp;BIE_Cpp_CoreCLR;BIE_Unity_Cpp_CoreCLR;BIE5_Mono;BIE6_Mono;BIE6_Unity_Mono;ML_Cpp_net6;ML_Cpp_CoreCLR;ML_Cpp_net472;ML_Mono;STANDALONE_Mono;STANDALONE_Cpp;STANDALONE_Cpp_CoreCLR</Configurations>
1717
</PropertyGroup>
1818

1919

2020
<Target Name="PreBuild" BeforeTargets="PreBuildEvent">
2121
<ItemGroup Condition="'$(Configuration)'=='ML_Cpp_net6' or '$(Configuration)'=='ML_Cpp_net472' or '$(Configuration)'=='STANDALONE_Cpp' or '$(Configuration)'=='BIE_Cpp'">
2222
<Exec Command="dotnet build ..\UniverseLib\src\UniverseLib.sln -c Release_IL2CPP_Unhollower" />
2323
</ItemGroup>
24-
<ItemGroup Condition="'$(Configuration)'=='BIE_Cpp_CoreCLR' or '$(Configuration)'=='BIE_Unity_Cpp_CoreCLR'">
24+
<ItemGroup Condition="'$(Configuration)'=='BIE_Cpp_CoreCLR' or '$(Configuration)'=='BIE_Unity_Cpp_CoreCLR' or '$(Configuration)'=='STANDALONE_Cpp_CoreCLR'">
2525
<Exec Command="dotnet build ..\UniverseLib\src\UniverseLib.sln -c Release_IL2CPP_Interop_BIE" />
2626
</ItemGroup>
2727
<ItemGroup Condition="'$(Configuration)'=='ML_Cpp_CoreCLR'">
@@ -121,6 +121,13 @@
121121
<DefineConstants>CPP,STANDALONE,UNHOLLOWER</DefineConstants>
122122
<AssemblyName>UnityExplorer.STANDALONE.IL2CPP</AssemblyName>
123123
</PropertyGroup>
124+
<!-- STANDALONE Il2Cpp CoreCLR-->
125+
<PropertyGroup Condition="'$(Configuration)'=='STANDALONE_Cpp_CoreCLR'">
126+
<TargetFramework>net6</TargetFramework>
127+
<OutputPath>..\Release\UnityExplorer.Standalone.IL2CPP.CoreCLR\</OutputPath>
128+
<DefineConstants>CPP,STANDALONE,INTEROP</DefineConstants>
129+
<AssemblyName>UnityExplorer.STANDALONE.IL2CPP.CoreCLR</AssemblyName>
130+
</PropertyGroup>
124131

125132
<!-- ~~~~~ NUGET ~~~~~ -->
126133
<ItemGroup>
@@ -142,13 +149,13 @@
142149
</ItemGroup>
143150

144151
<!-- il2cpp Interop nuget -->
145-
<ItemGroup Condition="'$(Configuration)'=='BIE_Cpp_CoreCLR' or '$(Configuration)'=='BIE_Unity_Cpp_CoreCLR' or '$(Configuration)'=='ML_Cpp_CoreCLR'">
152+
<ItemGroup Condition="'$(Configuration)'=='BIE_Cpp_CoreCLR' or '$(Configuration)'=='BIE_Unity_Cpp_CoreCLR' or '$(Configuration)'=='ML_Cpp_CoreCLR' or '$(Configuration)'=='STANDALONE_Cpp_CoreCLR'">
146153
<PackageReference Include="Il2CppInterop.Common" Version="1.0.0" />
147154
<PackageReference Include="Il2CppInterop.Runtime" Version="1.0.0" />
148155
</ItemGroup>
149156

150157
<!-- BIE il2cpp Interop -->
151-
<ItemGroup Condition="'$(Configuration)'=='BIE_Cpp_CoreCLR' or '$(Configuration)'=='BIE_Unity_Cpp_CoreCLR'">
158+
<ItemGroup Condition="'$(Configuration)'=='BIE_Cpp_CoreCLR' or '$(Configuration)'=='BIE_Unity_Cpp_CoreCLR' or '$(Configuration)'=='STANDALONE_Cpp_CoreCLR'">
152159
<Reference Include="UniverseLib">
153160
<HintPath>..\UniverseLib\Release\UniverseLib.Il2Cpp.Interop\UniverseLib.BIE.IL2CPP.Interop.dll</HintPath>
154161
<Private>True</Private>
@@ -305,7 +312,7 @@
305312
</Reference>
306313
</ItemGroup>
307314
<!-- Il2Cpp Interop -->
308-
<ItemGroup Condition="'$(Configuration)'=='BIE_Cpp_CoreCLR' or '$(Configuration)'=='BIE_Unity_Cpp_CoreCLR' or '$(Configuration)'=='ML_Cpp_CoreCLR'">
315+
<ItemGroup Condition="'$(Configuration)'=='BIE_Cpp_CoreCLR' or '$(Configuration)'=='BIE_Unity_Cpp_CoreCLR' or '$(Configuration)'=='ML_Cpp_CoreCLR' or '$(Configuration)'=='STANDALONE_Cpp_CoreCLR'">
309316
<Reference Include="Il2Cppmscorlib">
310317
<HintPath>..\lib\interop\Il2Cppmscorlib.dll</HintPath>
311318
<Private>False</Private>

‎src/UnityExplorer.sln

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Global
1717
Release_ML_Cpp_net472|Any CPU = Release_ML_Cpp_net472|Any CPU
1818
Release_ML_Cpp_net6preview|Any CPU = Release_ML_Cpp_net6preview|Any CPU
1919
Release_ML_Mono|Any CPU = Release_ML_Mono|Any CPU
20+
Release_STANDALONE_Cpp_CoreCLR|Any CPU = Release_STANDALONE_Cpp_CoreCLR|Any CPU
2021
Release_STANDALONE_Cpp|Any CPU = Release_STANDALONE_Cpp|Any CPU
2122
Release_STANDALONE_Mono|Any CPU = Release_STANDALONE_Mono|Any CPU
2223
EndGlobalSection
@@ -41,6 +42,8 @@ Global
4142
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Cpp_net6preview|Any CPU.Build.0 = ML_Cpp_net6|Any CPU
4243
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Mono|Any CPU.ActiveCfg = ML_Mono|Any CPU
4344
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_ML_Mono|Any CPU.Build.0 = ML_Mono|Any CPU
45+
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Cpp_CoreCLR|Any CPU.ActiveCfg = STANDALONE_Cpp_CoreCLR|Any CPU
46+
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Cpp_CoreCLR|Any CPU.Build.0 = STANDALONE_Cpp_CoreCLR|Any CPU
4447
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Cpp|Any CPU.ActiveCfg = STANDALONE_Cpp|Any CPU
4548
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Cpp|Any CPU.Build.0 = STANDALONE_Cpp|Any CPU
4649
{B21DBDE3-5D6F-4726-93AB-CC3CC68BAE7D}.Release_STANDALONE_Mono|Any CPU.ActiveCfg = STANDALONE_Mono|Any CPU

0 commit comments

Comments
 (0)