Skip to content

Commit 3bbd889

Browse files
jnmcdjnmcd
authored
Merge pull request #92 from ION28/develop
Merge develop into master for v0.3.1 release
2 parents d1bfd22 + f58a4df commit 3bbd889

File tree

119 files changed

+1210
-262
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

119 files changed

+1210
-262
lines changed

‎.gitignore‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
BLUESPAWN/.vs/
2-
BLUESPAWN/build/
3-
BLUESPAWN/artifacts/
1+
BLUESPAWN-agent/.vs/
2+
BLUESPAWN-agent/build/
3+
BLUESPAWN-agent/artifacts/

‎.gitmodules‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[submodule "BLUESPAWN/External Dependencies/cxxopts"]
2-
path = BLUESPAWN/External Dependencies/cxxopts
2+
path = BLUESPAWN-agent/External Dependencies/cxxopts
33
url = https://github.com/jarro2783/cxxopts

BLUESPAWN/BLUESPAWN.sln renamed to BLUESPAWN-agent/BLUESPAWN-agent.sln

Lines changed: 159 additions & 159 deletions
Large diffs are not rendered by default.

BLUESPAWN/BLUESPAWN/BLUESPAWN.vcxproj renamed to BLUESPAWN-agent/BLUESPAWN/BLUESPAWN.vcxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@
9191
<Import Project="..\Hunt\Hunts\Hunts.props" />
9292
<Import Project="..\React\Reactions\reactions.props" />
9393
<Import Project="..\External Dependencies\cxxopt.props" />
94+
<Import Project="..\CommonLib\CommonLib.props" />
9495
</ImportGroup>
9596
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
9697
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -101,6 +102,7 @@
101102
<Import Project="..\Hunt\Hunts\Hunts.props" />
102103
<Import Project="..\React\Reactions\reactions.props" />
103104
<Import Project="..\External Dependencies\cxxopt.props" />
105+
<Import Project="..\CommonLib\CommonLib.props" />
104106
</ImportGroup>
105107
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
106108
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -111,6 +113,7 @@
111113
<Import Project="..\Hunt\Hunts\Hunts.props" />
112114
<Import Project="..\React\Reactions\reactions.props" />
113115
<Import Project="..\External Dependencies\cxxopt.props" />
116+
<Import Project="..\CommonLib\CommonLib.props" />
114117
</ImportGroup>
115118
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
116119
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -121,6 +124,7 @@
121124
<Import Project="..\Hunt\Hunts\Hunts.props" />
122125
<Import Project="..\React\Reactions\reactions.props" />
123126
<Import Project="..\External Dependencies\cxxopt.props" />
127+
<Import Project="..\CommonLib\CommonLib.props" />
124128
</ImportGroup>
125129
<PropertyGroup Label="UserMacros" />
126130
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

BLUESPAWN/BLUESPAWN/BLUESPAWN.vcxproj.filters renamed to BLUESPAWN-agent/BLUESPAWN/BLUESPAWN.vcxproj.filters

File renamed without changes.

BLUESPAWN/BLUESPAWN/BLUESPAWN.vcxproj.user renamed to BLUESPAWN-agent/BLUESPAWN/BLUESPAWN.vcxproj.user

File renamed without changes.

BLUESPAWN/BLUESPAWN/headers/bluespawn/banners.h renamed to BLUESPAWN-agent/BLUESPAWN/headers/bluespawn/banners.h

File renamed without changes.

BLUESPAWN/BLUESPAWN/headers/bluespawn/bluespawn.h renamed to BLUESPAWN-agent/BLUESPAWN/headers/bluespawn/bluespawn.h

File renamed without changes.

BLUESPAWN/BLUESPAWN/src/BLUESPAWN.cpp renamed to BLUESPAWN-agent/BLUESPAWN/src/BLUESPAWN.cpp

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
#include "bluespawn/bluespawn.h"
2+
#include "common/wrappers.hpp"
3+
4+
#include <iostream>
25

36
int main(int argc, char* argv[])
47
{
5-
auto sink = Log::CLISink();
6-
Log::AddSink(sink);
8+
Log::CLISink output{};
9+
Log::AddSink(output);
710

811
print_banner();
912

BLUESPAWN/BLUESPAWN/src/banners.cpp renamed to BLUESPAWN-agent/BLUESPAWN/src/banners.cpp

File renamed without changes.

0 commit comments

Comments
 (0)