diff --git a/DebuggerCore/DebuggerCore.vcxproj b/DebuggerCore/DebuggerCore.vcxproj
index 0ebb71f..9900c11 100644
--- a/DebuggerCore/DebuggerCore.vcxproj
+++ b/DebuggerCore/DebuggerCore.vcxproj
@@ -26,7 +26,7 @@
SAK
Win32Proj
DebuggerCore
- 8.1
+ 10.0.10586.0
diff --git a/EdgeDiagnosticsAdapter.sln b/EdgeDiagnosticsAdapter.sln
index a75400c..5792fea 100644
--- a/EdgeDiagnosticsAdapter.sln
+++ b/EdgeDiagnosticsAdapter.sln
@@ -29,51 +29,52 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EdgeWebkitImpl", "EdgeWebki
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Win32 = Debug|Win32
Debug|x64 = Debug|x64
- Debug|x86 = Debug|x86
+ Release|Win32 = Release|Win32
Release|x64 = Release|x64
- Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Debug|Win32.ActiveCfg = Debug|Win32
+ {272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Debug|Win32.Build.0 = Debug|Win32
{272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Debug|x64.ActiveCfg = Debug|x64
{272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Debug|x64.Build.0 = Debug|x64
- {272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Debug|x86.ActiveCfg = Debug|x86
- {272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Debug|x86.Build.0 = Debug|x86
+ {272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Release|Win32.ActiveCfg = Release|Win32
+ {272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Release|Win32.Build.0 = Release|Win32
{272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Release|x64.ActiveCfg = Release|x64
{272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Release|x64.Build.0 = Release|x64
- {272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Release|x86.ActiveCfg = Release|x86
- {272CE0B2-BFE2-40EC-A0D0-BA6718522572}.Release|x86.Build.0 = Release|x86
+ {A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Debug|Win32.ActiveCfg = Debug|Win32
+ {A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Debug|Win32.Build.0 = Debug|Win32
{A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Debug|x64.ActiveCfg = Debug|x64
{A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Debug|x64.Build.0 = Debug|x64
- {A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Debug|x86.ActiveCfg = Debug|Win32
- {A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Debug|x86.Build.0 = Debug|Win32
+ {A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Release|Win32.ActiveCfg = Release|Win32
+ {A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Release|Win32.Build.0 = Release|Win32
{A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Release|x64.ActiveCfg = Release|x64
{A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Release|x64.Build.0 = Release|x64
- {A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Release|x86.ActiveCfg = Release|Win32
- {A9505C3C-5EB9-4989-8028-122E8A5F4B46}.Release|x86.Build.0 = Release|Win32
+ {DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Debug|Win32.ActiveCfg = Debug|Win32
+ {DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Debug|Win32.Build.0 = Debug|Win32
{DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Debug|x64.ActiveCfg = Debug|x64
{DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Debug|x64.Build.0 = Debug|x64
- {DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Debug|x86.ActiveCfg = Debug|Win32
- {DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Debug|x86.Build.0 = Debug|Win32
+ {DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Release|Win32.ActiveCfg = Release|Win32
+ {DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Release|Win32.Build.0 = Release|Win32
{DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Release|x64.ActiveCfg = Release|x64
{DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Release|x64.Build.0 = Release|x64
- {DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Release|x86.ActiveCfg = Release|Win32
- {DDABCB76-8AAF-454C-86D5-0E13EEA93667}.Release|x86.Build.0 = Release|Win32
+ {CAA616E3-F475-4AFC-BCBD-099E7882C616}.Debug|Win32.ActiveCfg = Debug|Win32
+ {CAA616E3-F475-4AFC-BCBD-099E7882C616}.Debug|Win32.Build.0 = Debug|Win32
{CAA616E3-F475-4AFC-BCBD-099E7882C616}.Debug|x64.ActiveCfg = Debug|x64
{CAA616E3-F475-4AFC-BCBD-099E7882C616}.Debug|x64.Build.0 = Debug|x64
- {CAA616E3-F475-4AFC-BCBD-099E7882C616}.Debug|x86.ActiveCfg = Debug|Win32
- {CAA616E3-F475-4AFC-BCBD-099E7882C616}.Debug|x86.Build.0 = Debug|Win32
+ {CAA616E3-F475-4AFC-BCBD-099E7882C616}.Release|Win32.ActiveCfg = Release|Win32
+ {CAA616E3-F475-4AFC-BCBD-099E7882C616}.Release|Win32.Build.0 = Release|Win32
{CAA616E3-F475-4AFC-BCBD-099E7882C616}.Release|x64.ActiveCfg = Release|x64
- {CAA616E3-F475-4AFC-BCBD-099E7882C616}.Release|x86.ActiveCfg = Release|Win32
- {CAA616E3-F475-4AFC-BCBD-099E7882C616}.Release|x86.Build.0 = Release|Win32
+ {CAA616E3-F475-4AFC-BCBD-099E7882C616}.Release|x64.Build.0 = Release|x64
+ {1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Debug|Win32.Build.0 = Debug|Any CPU
{1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Debug|x64.ActiveCfg = Debug|Any CPU
{1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Debug|x64.Build.0 = Debug|Any CPU
- {1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Debug|x86.ActiveCfg = Debug|Any CPU
- {1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Debug|x86.Build.0 = Debug|Any CPU
+ {1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Release|Win32.ActiveCfg = Release|Any CPU
+ {1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Release|Win32.Build.0 = Release|Any CPU
{1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Release|x64.ActiveCfg = Release|Any CPU
{1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Release|x64.Build.0 = Release|Any CPU
- {1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Release|x86.ActiveCfg = Release|Any CPU
- {1405EE7F-BDA9-4692-B689-200CA8DC1FBF}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/EdgeDiagnosticsAdapter/EdgeDiagnosticsAdapter.vcxproj b/EdgeDiagnosticsAdapter/EdgeDiagnosticsAdapter.vcxproj
index 127e23b..8425ff2 100644
--- a/EdgeDiagnosticsAdapter/EdgeDiagnosticsAdapter.vcxproj
+++ b/EdgeDiagnosticsAdapter/EdgeDiagnosticsAdapter.vcxproj
@@ -83,7 +83,7 @@
Disabled
_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
- $(SolutionDir)External\;..\Output\Published\$(Configuration)\$(Platform)\;..\external\websocketpp-0.5.0\;..\external\boost_1_60_0\;C:\src\EdgeDiagnosticsAdapter\External;..\Common
+ $(SolutionDir)External\boost_1_60_0\boost;$(SolutionDir)External\;..\Output\Published\$(Configuration)\$(Platform)\;..\external\websocketpp-0.5.0\;..\external\boost_1_60_0\;C:\src\EdgeDiagnosticsAdapter\External;..\Common;$(SolutionDir)External\;..\Common\
MultiThreadedDebug
@@ -103,7 +103,7 @@
Disabled
_DEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
- $(SolutionDir)External;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64;..\Common\;..\Output\Published\$(Configuration)\$(Platform)\;..\external\websocketpp-0.5.0\;..\external\boost_1_60_0\
+ $(SolutionDir)External\boost_1_60_0\boost;$(SolutionDir)External;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10586.0\um\x64;..\Common\;..\Output\Published\$(Configuration)\$(Platform)\;..\external\websocketpp-0.5.0\;..\external\boost_1_60_0\;$(SolutionDir)External\;..\Common\
MultiThreadedDebug
@@ -128,7 +128,7 @@
true
NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
- $(SolutionDir)External\;..\Output\Published\$(Configuration)\$(Platform);..\external\websocketpp-0.5.0\;..\external\boost_1_57_0\;;C:\src\EdgeDiagnosticsAdapter\External;..\Common
+ $(SolutionDir)External\boost_1_60_0\boost;$(SolutionDir)External\;..\Output\Published\$(Configuration)\$(Platform);..\external\websocketpp-0.5.0\;..\external\boost_1_57_0\;;C:\src\EdgeDiagnosticsAdapter\External;..\Common;$(SolutionDir)External\;..\Common\
MultiThreaded
@@ -155,7 +155,7 @@
true
NDEBUG;_CONSOLE;_LIB;%(PreprocessorDefinitions)
true
- $(SolutionDir)External;..\Common\;..\Output\Published\$(Configuration)\$(Platform);..\external\websocketpp-0.5.0\;..\external\boost_1_57_0\;
+ $(SolutionDir)External\boost_1_60_0\boost;$(SolutionDir)External;..\Common\;..\Output\Published\$(Configuration)\$(Platform);..\external\websocketpp-0.5.0\;..\external\boost_1_57_0\;;$(SolutionDir)External\;..\Common\
MultiThreaded
diff --git a/EdgeDiagnosticsAdapter/main.cpp b/EdgeDiagnosticsAdapter/main.cpp
index 8d7b81d..7725854 100644
--- a/EdgeDiagnosticsAdapter/main.cpp
+++ b/EdgeDiagnosticsAdapter/main.cpp
@@ -32,7 +32,7 @@ int wmain(int argc, wchar_t* argv[])
desc.add_options()
("launch,l", po::value(), "Launches Edge. Optionally at the URL specified in the value")
("killall,k", "Kills all running Edge processes.")
- ("chrome,c", "Launches Crhome in the background to serve the Chrome Developer Tools.")
+ ("chrome,c", "Launches Crhome in the background to serve the Chrome Developer Tools frontend.")
;
po::variables_map vm;
diff --git a/Proxy/Proxy.vcxproj b/Proxy/Proxy.vcxproj
index 8f6e23e..a23655e 100644
--- a/Proxy/Proxy.vcxproj
+++ b/Proxy/Proxy.vcxproj
@@ -1,17 +1,17 @@
-
+
Debug
- x86
+ Win32
Debug
x64
-
+
Release
- x86
+ Win32
Release
@@ -20,7 +20,7 @@
{272CE0B2-BFE2-40EC-A0D0-BA6718522572}
- x86Proj
+ Win32Proj
Proxy
SAK
SAK
@@ -30,7 +30,7 @@
10.0.10586.0
-
+
DynamicLibrary
true
v140
@@ -42,7 +42,7 @@
v140
Unicode
-
+
DynamicLibrary
false
v140
@@ -59,27 +59,27 @@
-
+
-
+
-
+
true
true
$(ProjectName)64
-
+
false
@@ -90,12 +90,12 @@
$(SolutionDir)Output\$(Configuration)\
$(SolutionDir)Output\Intermediate\$(ProjectName)\$(Configuration)\$(Platform)\
-
+
Use
Level3
Disabled
- x86;_DEBUG;_WINDOWS;_USRDLL;PROXY_EXPORTS;%(PreprocessorDefinitions)
+ Win32;_DEBUG;_WINDOWS;_USRDLL;PROXY_EXPORTS;%(PreprocessorDefinitions)
true
..\Common\;..\Output\Published\$(Configuration)\$(Platform)\;
MultiThreadedDebug
@@ -105,7 +105,7 @@
true
Proxy.def
..\Output\Published\$(Configuration)\;
- jsrt.lib;version.lib;Common.lib;DebuggerCore.lib
+ chakrart.lib;version.lib;Common.lib;DebuggerCore.lib
..\Output\Published\$(Configuration)\$(Platform)\
@@ -119,7 +119,7 @@
Use
Level3
Disabled
- x86;_DEBUG;_WINDOWS;_USRDLL;PROXY_EXPORTS;%(PreprocessorDefinitions)
+ Win32;_DEBUG;_WINDOWS;_USRDLL;PROXY_EXPORTS;%(PreprocessorDefinitions)
true
..\Common\;..\Output\Published\$(Configuration)\$(Platform)\;
MultiThreadedDebug
@@ -129,7 +129,7 @@
true
Proxy.def
..\Output\Published\$(Configuration)\;
- jsrt.lib;version.lib;Common.lib;DebuggerCore.lib
+ chakrart.lib;version.lib;Common.lib;DebuggerCore.lib
..\Output\Published\$(Configuration)\$(Platform)\
@@ -139,14 +139,14 @@
..\Output\Intermediate\$(ProjectName)\$(Configuration)\$(Platform)\;
-
+
Level3
Use
MaxSpeed
true
true
- x86;NDEBUG;_WINDOWS;_USRDLL;PROXY_EXPORTS;%(PreprocessorDefinitions)
+ Win32;NDEBUG;_WINDOWS;_USRDLL;PROXY_EXPORTS;%(PreprocessorDefinitions)
true
..\Common\;..\Output\Published\$(Configuration)\$(Platform)\;
MultiThreaded
@@ -158,7 +158,7 @@
true
Proxy.def
..\Output\Published\$(Configuration)\;
- jsrt.lib;version.lib;Common.lib;DebuggerCore.lib
+ chakrart.lib;version.lib;Common.lib;DebuggerCore.lib
..\Output\Published\$(Configuration)\$(Platform)\
@@ -174,7 +174,7 @@
MaxSpeed
true
true
- x86;NDEBUG;_WINDOWS;_USRDLL;PROXY_EXPORTS;%(PreprocessorDefinitions)
+ Win32;NDEBUG;_WINDOWS;_USRDLL;PROXY_EXPORTS;%(PreprocessorDefinitions)
true
..\Common\;..\Output\Published\$(Configuration)\$(Platform)\;
MultiThreaded
@@ -186,7 +186,7 @@
true
Proxy.def
..\Output\Published\$(Configuration)\;
- jsrt.lib;version.lib;Common.lib;DebuggerCore.lib
+ chakra.lib;version.lib;Common.lib;DebuggerCore.lib
..\Output\Published\$(Configuration)\$(Platform)\