Skip to content

Commit 80fa955

Browse files
author
theXappy
committed
[csprojs] Decouple from Visual Studio
1 parent 52bdb59 commit 80fa955

8 files changed

Lines changed: 99 additions & 132 deletions

File tree

‎src/Directory.Build.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<RepoSrcRoot>$(MSBuildThisFileDirectory)</RepoSrcRoot>
4+
</PropertyGroup>
5+
</Project>

‎src/RemoteNET.sln‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RemoteNET", "RemoteNET\Remo
1818
{E9771628-EF64-4DD8-9906-E7B1990A0FB9} = {E9771628-EF64-4DD8-9906-E7B1990A0FB9}
1919
EndProjectSection
2020
EndProject
21-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ScubaDiver_NetFramework", "ScubaDiver\project_netframework\ScubaDiver_NetFramework.csproj", "{8DF5D538-941D-44E8-803E-9E135926EBE8}"
21+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScubaDiver_NetFramework", "ScubaDiver\project_netframework\ScubaDiver_NetFramework.csproj", "{8DF5D538-941D-44E8-803E-9E135926EBE8}"
2222
EndProject
2323
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScubaDiver_NetCore", "ScubaDiver\project_netcore\ScubaDiver_NetCore.csproj", "{A0CC829C-E3B5-419B-A303-5A710389B74D}"
2424
EndProject
@@ -242,14 +242,14 @@ Global
242242
{52FBCBDC-C347-4A0A-BE58-29E749A755A3}.Release|Mixed.Build.0 = Release|Any CPU
243243
{52FBCBDC-C347-4A0A-BE58-29E749A755A3}.RelWithDebInfo|Mixed.ActiveCfg = Release|Any CPU
244244
{52FBCBDC-C347-4A0A-BE58-29E749A755A3}.RelWithDebInfo|Mixed.Build.0 = Release|Any CPU
245-
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.Debug|Mixed.ActiveCfg = Debug|x64
246-
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.Debug|Mixed.Build.0 = Debug|x64
247-
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.MinSizeRel|Mixed.ActiveCfg = MinSizeRel|x64
248-
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.MinSizeRel|Mixed.Build.0 = MinSizeRel|x64
249-
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.Release|Mixed.ActiveCfg = RelWithDebInfo|x64
250-
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.Release|Mixed.Build.0 = RelWithDebInfo|x64
251-
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.RelWithDebInfo|Mixed.ActiveCfg = RelWithDebInfo|x64
252-
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.RelWithDebInfo|Mixed.Build.0 = RelWithDebInfo|x64
245+
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.Debug|Mixed.ActiveCfg = Debug|Any CPU
246+
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.Debug|Mixed.Build.0 = Debug|Any CPU
247+
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.MinSizeRel|Mixed.ActiveCfg = Release|Any CPU
248+
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.MinSizeRel|Mixed.Build.0 = Release|Any CPU
249+
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.Release|Mixed.ActiveCfg = Release|Any CPU
250+
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.Release|Mixed.Build.0 = Release|Any CPU
251+
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.RelWithDebInfo|Mixed.ActiveCfg = Release|Any CPU
252+
{2823B68C-0B36-3BDA-857B-CF8C5ECD95B9}.RelWithDebInfo|Mixed.Build.0 = Release|Any CPU
253253
{9B25E3D2-91A8-4784-A3A3-39C1BE36A52A}.Debug|Mixed.ActiveCfg = Debug|Any CPU
254254
{9B25E3D2-91A8-4784-A3A3-39C1BE36A52A}.Debug|Mixed.Build.0 = Debug|Any CPU
255255
{9B25E3D2-91A8-4784-A3A3-39C1BE36A52A}.MinSizeRel|Mixed.ActiveCfg = Debug|Any CPU

‎src/RemoteNET/RemoteNET.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@
5959

6060
<Target Name="CopyDlls" BeforeTargets="BeforeBuild">
6161
<ItemGroup>
62-
<CopyOperations Include="$(SolutionDir)\dist\$(Configuration)\Win32\**\*.exe;$(SolutionDir)\dist\$(Configuration)\Win32\**\*.dll;$(SolutionDir)\dist\$(Configuration)\Win32\**\*.pdb">
62+
<CopyOperations Include="$(RepoSrcRoot)dist\$(Configuration)\Win32\**\*.exe;$(RepoSrcRoot)dist\$(Configuration)\Win32\**\*.dll;$(RepoSrcRoot)dist\$(Configuration)\Win32\**\*.pdb">
6363
<DestinationFolder>$(ProjectDir)\Resources\%(RecursiveDir)</DestinationFolder>
6464
</CopyOperations>
65-
<CopyOperations Include="$(SolutionDir)\dist\$(Configuration)\x64\**\*.exe;$(SolutionDir)\dist\$(Configuration)\x64\**\*.dll;$(SolutionDir)\dist\$(Configuration)\x64\**\*.pdb">
65+
<CopyOperations Include="$(RepoSrcRoot)dist\$(Configuration)\x64\**\*.exe;$(RepoSrcRoot)dist\$(Configuration)\x64\**\*.dll;$(RepoSrcRoot)dist\$(Configuration)\x64\**\*.pdb">
6666
<DestinationFolder>$(ProjectDir)\Resources\%(RecursiveDir)</DestinationFolder>
6767
</CopyOperations>
6868
<CopyOperations Include="$(ProjectDir)\..\InjectableDummy\bin\$(Configuration)\net6.0-windows\**\*">
@@ -79,7 +79,7 @@
7979
<ZipOperations Include="$(ProjectDir)\..\Lifeboat\bin\$(Configuration)\net8.0">
8080
<ZipFileName>$(ProjectDir)\Resources\Lifeboat.zip</ZipFileName>
8181
</ZipOperations>
82-
<ZipOperations Include="$(SolutionDir)\dist\$(Configuration)\ScubaDivers">
82+
<ZipOperations Include="$(RepoSrcRoot)dist\$(Configuration)\ScubaDivers">
8383
<ZipFileName>$(ProjectDir)\Resources\ScubaDivers.zip</ZipFileName>
8484
</ZipOperations>
8585
<!-- Detours - choose one of 2 directories based on configuration -->

‎src/ScubaDiver/project_net5/ScubaDiver_Net5.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
<Target Name="CopyOutputToDestination" AfterTargets="Build">
6262
<ItemGroup>
6363
<CopyOperations Include="$(TargetDir)\*">
64-
<DestinationFolder>$(SolutionDir)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
64+
<DestinationFolder>$(RepoSrcRoot)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
6565
</CopyOperations>
6666
</ItemGroup>
6767
<Message Text="[~] $(ProjectName) - Copying to ScubaDiver folder" Importance="high" />

‎src/ScubaDiver/project_net6_x64/ScubaDiver_Net6_x64.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
<Target Name="CopyOutputToDestination" AfterTargets="Build">
169169
<ItemGroup>
170170
<CopyOperations Include="$(TargetDir)\*">
171-
<DestinationFolder>$(SolutionDir)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
171+
<DestinationFolder>$(RepoSrcRoot)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
172172
</CopyOperations>
173173
</ItemGroup>
174174
<Message Text="[~] $(ProjectName) - Copying to ScubaDiver folder" Importance="high" />

‎src/ScubaDiver/project_net6_x86/ScubaDiver_Net6_x86.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
<Target Name="CopyOutputToDestination" AfterTargets="Build">
169169
<ItemGroup>
170170
<CopyOperations Include="$(TargetDir)\*">
171-
<DestinationFolder>$(SolutionDir)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
171+
<DestinationFolder>$(RepoSrcRoot)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
172172
</CopyOperations>
173173
</ItemGroup>
174174
<Message Text="[~] $(ProjectName) - Copying to ScubaDiver folder" Importance="high" />

‎src/ScubaDiver/project_netcore/ScubaDiver_NetCore.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
<Target Name="CopyOutputToDestination" AfterTargets="Build">
6969
<ItemGroup>
7070
<CopyOperations Include="$(TargetDir)\*">
71-
<DestinationFolder>$(SolutionDir)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
71+
<DestinationFolder>$(RepoSrcRoot)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
7272
</CopyOperations>
7373
</ItemGroup>
7474
<Message Text="[~] $(ProjectName) - Copying to ScubaDiver folder" Importance="high" />

‎src/ScubaDiver/project_netframework/ScubaDiver_NetFramework.csproj‎

Lines changed: 78 additions & 116 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,79 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{8DF5D538-941D-44E8-803E-9E135926EBE8}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>ScubaDiver</RootNamespace>
11-
<AssemblyName>ScubaDiver_NetFramework</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<Deterministic>true</Deterministic>
15-
<TargetFrameworkProfile />
16-
<NuGetPackageImportStamp>
17-
</NuGetPackageImportStamp>
18-
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DOT_NET_FRAMEWORK;DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
<LangVersion>latest</LangVersion>
28-
<PlatformTarget>AnyCPU</PlatformTarget>
29-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
30-
</PropertyGroup>
31-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
32-
<DebugType>pdbonly</DebugType>
33-
<Optimize>true</Optimize>
34-
<OutputPath>bin\Release\</OutputPath>
35-
<DefineConstants>DOT_NET_FRAMEWORK;TRACE</DefineConstants>
36-
<ErrorReport>prompt</ErrorReport>
37-
<WarningLevel>4</WarningLevel>
38-
<LangVersion>latest</LangVersion>
39-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
40-
</PropertyGroup>
41-
<ItemGroup>
42-
<Compile Include="..\DotNetDiver.cs" />
43-
<Compile Include="..\DiverBase.cs" />
44-
<Compile Include="..\DllEntry.cs" />
45-
<Compile Include="..\Hooking\HarmonyWrapper.cs" />
46-
<Compile Include="..\Hooking\HookingCenter.cs" />
47-
<Compile Include="..\Logger.cs" />
48-
<Compile Include="..\Properties\AssemblyInfo.cs" />
49-
<Compile Include="..\RegisteredEventHandlerInfo.cs" />
50-
<Compile Include="..\RegisteredMethodHookInfo.cs" />
51-
<Compile Include="..\Utils\ClrExt.cs" Link="Utils\ClrExt.cs" />
52-
<Compile Include="..\Utils\Converter.cs" Link="Utils\Converter.cs" />
53-
<Compile Include="..\Utils\FreezeFuncsFactory.cs" Link="Utils\FreezeFuncsFactory.cs" />
54-
<Compile Include="..\Utils\FrozenObjectsCollection.cs" Link="Utils\FrozenObjectsCollection.cs" />
55-
<Compile Include="..\Utils\ObjectDumpFactory.cs" Link="Utils\ObjectDumpFactory.cs" />
56-
<Compile Include="..\Utils\Pinnable.cs" Link="Utils\Pinnable.cs" />
57-
<Compile Include="..\Utils\SmartLocksDict.cs" Link="Utils\SmartLocksDict.cs" />
58-
<Compile Include="..\Utils\TypesResolver.cs" Link="Utils\TypesResolver.cs" />
59-
<Compile Include="..\Utils\UnifiedAppDomain.cs" Link="Utils\UnifiedAppDomain.cs" />
60-
<Compile Include="..\HttpRequestsListener.cs" />
61-
<Compile Include="..\IRequestsListener.cs" />
62-
<Compile Include="..\ScubaDiverMessage.cs" />
63-
<Compile Include="..\MsvcPrimitives\FirstClassTypeInfo.cs" />
64-
<Compile Include="..\TricksterException.cs" />
65-
<Compile Include="..\FunctionInfo.cs" />
66-
<Compile Include="..\TypeInfo.cs" />
67-
<Compile Include="..\SecondClassTypeInfo.cs" />
68-
<Compile Include="..\ModuleInfo.cs" />
69-
<Compile Include="..\RichModuleInfo.cs" />
70-
<Compile Include="..\ModuleOperatorFunctions.cs" />
71-
<Compile Include="..\ModuleSection.cs" />
72-
<Compile Include="..\PEFormat\IMAGE_DOS_HEADER.cs" />
73-
<Compile Include="..\PEFormat\IMAGE_NT_HEADERS.cs" />
74-
<Compile Include="..\PEFormat\IMAGE_FILE_HEADER.cs" />
75-
<Compile Include="..\PEFormat\IMAGE_OPTIONAL_HEADER32.cs" />
76-
<Compile Include="..\PEFormat\IMAGE_DATA_DIRECTORY.cs" />
77-
<Compile Include="..\PEFormat\IMAGE_SECTION_HEADER.cs" />
78-
<Compile Include="..\ProcessModuleExtensions.cs" />
79-
</ItemGroup>
80-
<ItemGroup>
81-
<None Include="..\app.config" />
82-
</ItemGroup>
83-
<ItemGroup>
84-
<Reference Include="System" />
85-
<Reference Include="System.Net.Http" />
86-
<Reference Include="System.Numerics" />
87-
</ItemGroup>
88-
<ItemGroup>
89-
<PackageReference Include="Lib.Harmony">
90-
<Version>2.3.3</Version>
91-
</PackageReference>
92-
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces">
93-
<Version>8.0.0</Version>
94-
</PackageReference>
95-
<PackageReference Include="Microsoft.Diagnostics.Runtime">
96-
<Version>3.1.512801</Version>
97-
</PackageReference>
98-
<PackageReference Include="System.Runtime.CompilerServices.Unsafe">
99-
<Version>6.0.0</Version>
100-
</PackageReference>
101-
</ItemGroup>
102-
<ItemGroup>
103-
<ProjectReference Include="..\..\ScubaDiver.API\ScubaDiver.API.csproj">
104-
<Project>{0fe20420-27e2-467f-ab2d-78b6a795b255}</Project>
105-
<Name>ScubaDiver.API</Name>
106-
</ProjectReference>
107-
</ItemGroup>
108-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
109-
<Target Name="CopyOutputToDestination" AfterTargets="Build">
110-
<ItemGroup>
111-
<CopyOperations Include="$(TargetDir)\*">
112-
<DestinationFolder>$(SolutionDir)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
113-
</CopyOperations>
114-
</ItemGroup>
115-
<Copy SourceFiles="@(CopyOperations)" DestinationFolder="%(CopyOperations.DestinationFolder)" />
116-
</Target>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>net462</TargetFramework>
5+
<AssemblyName>ScubaDiver_NetFramework</AssemblyName>
6+
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
7+
<RootNamespace>ScubaDiver</RootNamespace>
8+
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
9+
<LangVersion>latest</LangVersion>
10+
<DefineConstants>$(DefineConstants);DOT_NET_FRAMEWORK</DefineConstants>
11+
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
12+
</PropertyGroup>
13+
14+
<ItemGroup>
15+
<Compile Include="..\DotNetDiver.cs" />
16+
<Compile Include="..\DiverBase.cs" />
17+
<Compile Include="..\DllEntry.cs" />
18+
<Compile Include="..\Hooking\HarmonyWrapper.cs" />
19+
<Compile Include="..\Hooking\HookingCenter.cs" />
20+
<Compile Include="..\Logger.cs" />
21+
<Compile Include="..\RegisteredEventHandlerInfo.cs" />
22+
<Compile Include="..\RegisteredMethodHookInfo.cs" />
23+
<Compile Include="..\Utils\ClrExt.cs" Link="Utils\ClrExt.cs" />
24+
<Compile Include="..\Utils\Converter.cs" Link="Utils\Converter.cs" />
25+
<Compile Include="..\Utils\FreezeFuncsFactory.cs" Link="Utils\FreezeFuncsFactory.cs" />
26+
<Compile Include="..\Utils\FrozenObjectsCollection.cs" Link="Utils\FrozenObjectsCollection.cs" />
27+
<Compile Include="..\Utils\ObjectDumpFactory.cs" Link="Utils\ObjectDumpFactory.cs" />
28+
<Compile Include="..\Utils\Pinnable.cs" Link="Utils\Pinnable.cs" />
29+
<Compile Include="..\Utils\SmartLocksDict.cs" Link="Utils\SmartLocksDict.cs" />
30+
<Compile Include="..\Utils\TypesResolver.cs" Link="Utils\TypesResolver.cs" />
31+
<Compile Include="..\Utils\UnifiedAppDomain.cs" Link="Utils\UnifiedAppDomain.cs" />
32+
<Compile Include="..\HttpRequestsListener.cs" />
33+
<Compile Include="..\IRequestsListener.cs" />
34+
<Compile Include="..\ScubaDiverMessage.cs" />
35+
<Compile Include="..\MsvcPrimitives\FirstClassTypeInfo.cs" />
36+
<Compile Include="..\TricksterException.cs" />
37+
<Compile Include="..\FunctionInfo.cs" />
38+
<Compile Include="..\TypeInfo.cs" />
39+
<Compile Include="..\SecondClassTypeInfo.cs" />
40+
<Compile Include="..\ModuleInfo.cs" />
41+
<Compile Include="..\RichModuleInfo.cs" />
42+
<Compile Include="..\ModuleOperatorFunctions.cs" />
43+
<Compile Include="..\ModuleSection.cs" />
44+
<Compile Include="..\PEFormat\IMAGE_DOS_HEADER.cs" />
45+
<Compile Include="..\PEFormat\IMAGE_NT_HEADERS.cs" />
46+
<Compile Include="..\PEFormat\IMAGE_FILE_HEADER.cs" />
47+
<Compile Include="..\PEFormat\IMAGE_OPTIONAL_HEADER32.cs" />
48+
<Compile Include="..\PEFormat\IMAGE_DATA_DIRECTORY.cs" />
49+
<Compile Include="..\PEFormat\IMAGE_SECTION_HEADER.cs" />
50+
<Compile Include="..\ProcessModuleExtensions.cs" />
51+
</ItemGroup>
52+
53+
<ItemGroup>
54+
<Reference Include="System.Net.Http" />
55+
<Reference Include="System.Numerics" />
56+
</ItemGroup>
57+
58+
<ItemGroup>
59+
<PackageReference Include="Lib.Harmony" Version="2.3.3" />
60+
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
61+
<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
62+
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
63+
</ItemGroup>
64+
65+
<ItemGroup>
66+
<ProjectReference Include="..\..\ScubaDiver.API\ScubaDiver.API.csproj" />
67+
</ItemGroup>
68+
69+
<Target Name="CopyOutputToDestination" AfterTargets="Build">
70+
<ItemGroup>
71+
<CopyOperations Include="$(TargetDir)\*">
72+
<DestinationFolder>$(RepoSrcRoot)dist\$(ConfigurationName)\ScubaDivers\$(ProjectName)\</DestinationFolder>
73+
</CopyOperations>
74+
</ItemGroup>
75+
<Message Text="[~] $(ProjectName) - Copying to ScubaDiver folder" Importance="high" />
76+
<Copy SourceFiles="@(CopyOperations)" DestinationFolder="%(CopyOperations.DestinationFolder)" />
77+
</Target>
78+
11779
</Project>

0 commit comments

Comments
 (0)