Skip to content

Commit 3d5abb6

Browse files
js6pakjs6pak
committed
Refactor project files
1 parent 64bc069 commit 3d5abb6

File tree

13 files changed

+82
-172
lines changed

13 files changed

+82
-172
lines changed

‎Cpp2IL.Core.Tests/Cpp2IL.Core.Tests.csproj‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net7.0</TargetFramework>
5-
<Nullable>enable</Nullable>
64

75
<IsPackable>false</IsPackable>
86
</PropertyGroup>
@@ -12,11 +10,10 @@
1210
</ItemGroup>
1311

1412
<ItemGroup>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
13+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
1614
<PackageReference Include="NUnit" Version="3.13.3" />
17-
<PackageReference Include="NUnit3TestAdapter" Version="4.3.1" />
18-
<PackageReference Include="NUnit.Analyzers" Version="3.5.0" />
15+
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
16+
<PackageReference Include="NUnit.Analyzers" Version="3.6.1" />
1917
<PackageReference Include="coverlet.collector" Version="3.2.0" />
2018
</ItemGroup>
21-
2219
</Project>

‎Cpp2IL.Core/Cpp2IL.Core.csproj‎

Lines changed: 9 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,36 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Authors>Sam Byass (Samboy063)</Authors>
4-
<Company>N/A</Company>
5-
<Copyright>Copyright © Samboy063 2019-2023</Copyright>
6-
<DebugType>embedded</DebugType>
3+
<TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
4+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
5+
76
<Description>Reverses Unity's IL2CPP Build Process</Description>
87
<EmbedUntrackedSources>true</EmbedUntrackedSources>
98
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
10-
<LangVersion>10</LangVersion>
11-
<Nullable>enable</Nullable>
12-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
13-
<PackageId>Samboy063.Cpp2IL.Core</PackageId>
14-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15-
<PackageProjectUrl>https://github.com/SamboyCoding/Cpp2IL</PackageProjectUrl>
16-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
17-
<RepositoryType>git</RepositoryType>
18-
<RepositoryUrl>https://github.com/SamboyCoding/Cpp2IL.git</RepositoryUrl>
19-
<TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
20-
<Title>Cpp2IL.Core</Title>
21-
<VersionPrefix>2022.1.0</VersionPrefix>
229
<!--Plugins make this non-trimmable-->
23-
24-
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
2510
</PropertyGroup>
2611

2712
<ItemGroup>
2813
<!--Needed for DLL output-->
29-
<PackageReference Include="AsmResolver.DotNet" Version="5.1.0" />
30-
14+
<PackageReference Include="AsmResolver.DotNet" Version="5.2.0" />
15+
3116
<!--For ARM64 dissassembly-->
3217
<PackageReference Include="Disarm" Version="2022.1.0-master.26" />
3318

3419
<!--For X86/X64 disassembly-->
3520
<PackageReference Include="Iced" Version="1.18.0" />
36-
21+
3722
<!--For ARM64 and ARMv7 disassembly. Future: Remove once disarm is stable and move ARMv7 to CapstoneSharp by 6pak-->
3823
<PackageReference Include="js6pak.Gee.External.Capstone" Version="2.1.0" />
39-
24+
4025
<!--Not used at runtime, but needed for the build-->
4126
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
4227

43-
<PackageReference Include="PolySharp" Version="1.12.1" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
44-
</ItemGroup>
45-
46-
<ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
47-
<!--Supplementary packages to provide modern runtime features on netstandard2-->
48-
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
28+
<PackageReference Include="PolySharp" Version="1.13.1" PrivateAssets="all" />
4929
</ItemGroup>
5030

5131
<ItemGroup>
5232
<ProjectReference Include="..\LibCpp2IL\LibCpp2IL.csproj" />
53-
33+
5434
<!--Future: Consider moving to its own project and moving the impl in cpp2il to a plugin-->
5535
<ProjectReference Include="..\StableNameDotNet\StableNameDotNet.csproj" />
5636
</ItemGroup>

‎Cpp2IL.Gui/Cpp2IL.Gui.csproj‎

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<BuiltInComInteropSupport>true</BuiltInComInteropSupport> <!--Needed for avalonia-->
4-
<Configurations>Debug;Release</Configurations>
5-
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
6-
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
7-
<Nullable>enable</Nullable>
3+
<TargetFramework>net7.0</TargetFramework>
84
<OutputType>Exe</OutputType>
9-
<Platforms>AnyCPU;x64</Platforms>
5+
106
<PublishSingleFile>true</PublishSingleFile>
117
<PublishTrimmed>true</PublishTrimmed>
12-
<TargetFramework>net7.0</TargetFramework>
8+
<BuiltInComInteropSupport>true</BuiltInComInteropSupport> <!--Needed for avalonia-->
9+
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
10+
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
1311
<TrimMode>link</TrimMode>
14-
<VersionPrefix>2022.1.0</VersionPrefix>
1512
</PropertyGroup>
13+
1614
<ItemGroup>
17-
<Folder Include="Models\" />
18-
<AvaloniaResource Include="Assets\**" />
19-
<None Remove=".gitignore" />
20-
</ItemGroup>
21-
<ItemGroup>
15+
<ProjectReference Include="..\Cpp2IL.Core\Cpp2IL.Core.csproj" />
16+
<ProjectReference Include="..\SharpTreeView\SharpTreeView.csproj" />
17+
2218
<PackageReference Include="Avalonia" Version="11.0.0-preview5" />
2319
<PackageReference Include="Avalonia.AvaloniaEdit" Version="11.0.0-preview2" />
2420
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview5" />
@@ -27,18 +23,9 @@
2723
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview5" />
2824
<PackageReference Include="AvaloniaEdit.TextMate" Version="11.0.0-preview2" />
2925
</ItemGroup>
26+
3027
<ItemGroup>
31-
<ProjectReference Include="..\Cpp2IL.Core\Cpp2IL.Core.csproj" />
32-
<ProjectReference Include="..\SharpTreeView\SharpTreeView.csproj" />
33-
</ItemGroup>
34-
<ItemGroup>
35-
<None Remove="Images\Assembly.png" />
36-
<EmbeddedResource Include="Images\Assembly.png" />
37-
<None Remove="Images\Class.png" />
38-
<EmbeddedResource Include="Images\Class.png" />
39-
<None Remove="Images\NameSpace.png" />
40-
<EmbeddedResource Include="Images\NameSpace.png" />
41-
<None Remove="Images\Method.png" />
42-
<EmbeddedResource Include="Images\Method.png" />
28+
<AvaloniaResource Include="Assets\**" />
29+
<EmbeddedResource Include="Images\*.png" />
4330
</ItemGroup>
4431
</Project>

‎Cpp2IL.Plugin.BuildReport/Cpp2IL.Plugin.BuildReport.csproj‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net7.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<DebugType>embedded</DebugType>
84
</PropertyGroup>
95

106
<ItemGroup>
11-
<ProjectReference Include="..\Cpp2IL.Core\Cpp2IL.Core.csproj">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>compile; build</IncludeAssets>
14-
<ExcludedAssets>runtime</ExcludedAssets>
15-
</ProjectReference>
7+
<ProjectReference Include="..\Cpp2IL.Core\Cpp2IL.Core.csproj" />
168
</ItemGroup>
17-
18-
<ItemGroup>
19-
<PackageReference Include="System.Text.Json" Version="7.0.1" />
20-
</ItemGroup>
21-
229
</Project>

‎Cpp2IL.Plugin.OrbisPkg/Cpp2IL.Plugin.OrbisPkg.csproj‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
7-
<LangVersion>10</LangVersion>
8-
<DebugType>embedded</DebugType>
9-
</PropertyGroup>
10-
11-
<ItemGroup>
12-
<ProjectReference Include="..\Cpp2IL.Core\Cpp2IL.Core.csproj" />
13-
</ItemGroup>
14-
15-
<ItemGroup>
16-
<Reference Include="LibOrbisPkg.Core">
17-
<HintPath>Deps\LibOrbisPkg.Core.dll</HintPath>
18-
</Reference>
19-
</ItemGroup>
20-
21-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>netstandard2.0</TargetFramework>
4+
</PropertyGroup>
5+
6+
<ItemGroup>
7+
<ProjectReference Include="..\Cpp2IL.Core\Cpp2IL.Core.csproj" />
8+
9+
<Reference Include="LibOrbisPkg.Core">
10+
<HintPath>Deps\LibOrbisPkg.Core.dll</HintPath>
11+
</Reference>
12+
</ItemGroup>
13+
</Project>

‎Cpp2IL.Plugin.StrippedCodeRegSupport/Cpp2IL.Plugin.StrippedCodeRegSupport.csproj‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFramework>net7.0</TargetFramework>
5-
<ImplicitUsings>enable</ImplicitUsings>
6-
<Nullable>enable</Nullable>
74
</PropertyGroup>
85

96
<ItemGroup>
10-
<ProjectReference Include="..\Cpp2IL.Core\Cpp2IL.Core.csproj" />
7+
<ProjectReference Include="..\Cpp2IL.Core\Cpp2IL.Core.csproj" />
118
</ItemGroup>
12-
139
</Project>

‎Cpp2IL/Cpp2IL.csproj‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,16 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<Company>Samboy063</Company>
4-
<Copyright>Copyright © Samboy063 2019-2023</Copyright>
5-
<Configurations>Debug;Release</Configurations>
6-
<DebugType>embedded</DebugType>
7-
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
8-
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
9-
<LangVersion>10</LangVersion>
10-
<Nullable>enable</Nullable>
3+
<TargetFrameworks>net7.0;net472</TargetFrameworks>
114
<OutputType>Exe</OutputType>
5+
126
<PublishSingleFile Condition="'$(TargetFramework)'!='net472' and '$(GITHUB_ACTIONS)' == 'true'">true</PublishSingleFile>
137
<PublishTrimmed>true</PublishTrimmed>
14-
<TargetFrameworks>net7.0;net472</TargetFrameworks>
8+
<EnableCompressionInSingleFile>true</EnableCompressionInSingleFile>
9+
<IncludeNativeLibrariesForSelfExtract>true</IncludeNativeLibrariesForSelfExtract>
1510
<TrimMode>partial</TrimMode>
16-
<VersionPrefix>2022.1.0</VersionPrefix>
1711
<ServerGarbageCollection>true</ServerGarbageCollection>
1812
</PropertyGroup>
1913

20-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
21-
<OutputPath>bin\x64\Debug\</OutputPath>
22-
</PropertyGroup>
23-
2414
<ItemGroup>
2515
<PackageReference Include="CommandLineParser" Version="2.9.1" />
2616
<PackageReference Include="Pastel" Version="4.1.0" />

‎Directory.Build.props‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<Project>
2+
<PropertyGroup Condition="$(MSBuildProjectName) != 'SharpTreeView'">
3+
<Nullable>enable</Nullable>
4+
<LangVersion>10</LangVersion>
5+
<ImplicitUsings>enable</ImplicitUsings>
6+
<DebugType>embedded</DebugType>
7+
8+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
9+
10+
<VersionPrefix>2022.1.0</VersionPrefix>
11+
<VersionSuffix>development</VersionSuffix>
12+
<Authors>Sam Byass (Samboy063)</Authors>
13+
<Copyright>Copyright © Samboy063 2019-2023</Copyright>
14+
15+
<PackageProjectUrl>https://github.com/SamboyCoding/Cpp2IL</PackageProjectUrl>
16+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
17+
<RepositoryType>git</RepositoryType>
18+
<RepositoryUrl>https://github.com/SamboyCoding/Cpp2IL.git</RepositoryUrl>
19+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
20+
</PropertyGroup>
21+
</Project>

‎Directory.Build.targets‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup Condition="$(MSBuildProjectName) != 'SharpTreeView'">
3+
<PackageId Condition="'$(PackageId)' == ''">Samboy063.$(AssemblyName)</PackageId>
4+
</PropertyGroup>
5+
</Project>

‎LibCpp2IL/LibCpp2IL.csproj‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
4-
<Nullable>enable</Nullable>
5-
<LangVersion>9</LangVersion>
6-
<DebugType>embedded</DebugType>
7-
<PackageId>Samboy063.LibCpp2IL</PackageId>
8-
<Title>LibCpp2IL</Title>
9-
<Authors>Samboy063</Authors>
10-
<Copyright>Copyright © Samboy063 2019-2023</Copyright>
11-
<Company>Samboy063</Company>
12-
<VersionPrefix>2022.1.0</VersionPrefix>
13-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
14-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
15-
<RepositoryType>git</RepositoryType>
16-
<RepositoryUrl>https://github.com/SamboyCoding/Cpp2IL.git</RepositoryUrl>
17-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
18-
<Description>Library for interacting with IL2CPP metadata and binaries</Description>
19-
<Configurations>Debug;Release</Configurations>
203
<TargetFrameworks>net7.0;net6.0;netstandard2.0</TargetFrameworks>
214
<IsTrimmable>true</IsTrimmable>
5+
6+
<Description>Library for interacting with IL2CPP metadata and binaries</Description>
7+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
228
</PropertyGroup>
239

2410
<ItemGroup>
25-
<PackageReference Include="AssetRipper.VersionUtilities" Version="1.3.1" />
11+
<PackageReference Include="AssetRipper.VersionUtilities" Version="1.4.0" />
2612
</ItemGroup>
2713

2814
<ItemGroup Condition="'$(TargetFramework)' != 'net6.0'">
@@ -34,5 +20,4 @@
3420
<ItemGroup>
3521
<ProjectReference Include="..\WasmDisassembler\WasmDisassembler.csproj" />
3622
</ItemGroup>
37-
3823
</Project>

0 commit comments

Comments
 (0)