Merge pull request #6 from keiichi-morisato/master

Upgrade solution to VS2015 and x64 support
2016-06-21 15:16:13 -07:00 · 2016-06-21 15:16:13 -07:00 · 0d53f8bc95
--- a/.gitignore
+++ b/.gitignore
@ -82,3 +82,4 @@ lib/
 ssl/
 .deps/
 *.opendb
+*.db
--- a/Projects/AppInsights_Win32/.vs/application_insights/v14/.suo
+++ b/Projects/AppInsights_Win32/.vs/application_insights/v14/.suo
--- a/Projects/AppInsights_Win32/application_insights.sln
+++ b/Projects/AppInsights_Win32/application_insights.sln
@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core\core.vcxproj", "{F2377726-D69D-4A26-A3AF-969FD0399427}"
 EndProject
@ -11,6 +11,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B9DFD4EA-B8B
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{288A8E49-E064-439B-8682-DB010CBDF609}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{D08D10AB-DE85-4A6E-8EF7-F61AD2C98387}"
+	ProjectSection(SolutionItems) = preProject
+		package\AppInsights_Win32.autopkg = package\AppInsights_Win32.autopkg
+		package\build.bat = package\build.bat
+		package\package.ps1 = package\package.ps1
+		package\README.md = package\README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|ARM = Debug|ARM
@ -24,21 +32,23 @@ Global
 		{F2377726-D69D-4A26-A3AF-969FD0399427}.Debug|ARM.ActiveCfg = Debug|Win32
 		{F2377726-D69D-4A26-A3AF-969FD0399427}.Debug|Win32.ActiveCfg = Debug|Win32
 		{F2377726-D69D-4A26-A3AF-969FD0399427}.Debug|Win32.Build.0 = Debug|Win32
-		{F2377726-D69D-4A26-A3AF-969FD0399427}.Debug|x64.ActiveCfg = Debug|Win32
-		{F2377726-D69D-4A26-A3AF-969FD0399427}.Debug|x64.Build.0 = Debug|Win32
+		{F2377726-D69D-4A26-A3AF-969FD0399427}.Debug|x64.ActiveCfg = Debug|x64
+		{F2377726-D69D-4A26-A3AF-969FD0399427}.Debug|x64.Build.0 = Debug|x64
 		{F2377726-D69D-4A26-A3AF-969FD0399427}.Release|ARM.ActiveCfg = Release|Win32
 		{F2377726-D69D-4A26-A3AF-969FD0399427}.Release|Win32.ActiveCfg = Release|Win32
 		{F2377726-D69D-4A26-A3AF-969FD0399427}.Release|Win32.Build.0 = Release|Win32
-		{F2377726-D69D-4A26-A3AF-969FD0399427}.Release|x64.ActiveCfg = Release|Win32
+		{F2377726-D69D-4A26-A3AF-969FD0399427}.Release|x64.ActiveCfg = Release|x64
+		{F2377726-D69D-4A26-A3AF-969FD0399427}.Release|x64.Build.0 = Release|x64
 		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Debug|ARM.ActiveCfg = Debug|Win32
 		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Debug|Win32.ActiveCfg = Debug|Win32
 		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Debug|Win32.Build.0 = Debug|Win32
-		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Debug|x64.ActiveCfg = Debug|Win32
-		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Debug|x64.Build.0 = Debug|Win32
+		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Debug|x64.ActiveCfg = Debug|x64
+		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Debug|x64.Build.0 = Debug|x64
 		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Release|ARM.ActiveCfg = Release|Win32
 		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Release|Win32.ActiveCfg = Release|Win32
 		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Release|Win32.Build.0 = Release|Win32
-		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Release|x64.ActiveCfg = Release|Win32
+		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Release|x64.ActiveCfg = Release|x64
+		{D9D00C85-E6BA-496E-AC7E-C3744AD38194}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/Projects/AppInsights_Win32/core/core.vcxproj
+++ b/Projects/AppInsights_Win32/core/core.vcxproj
@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{F2377726-D69D-4A26-A3AF-969FD0399427}</ProjectGuid>
@ -20,13 +28,26 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@ -36,18 +57,32 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <IncludePath>$(ProjectDir)\..\..\include;$(IncludePath)</IncludePath>
    <LibraryPath>$(ProjectDir)\..\..\lib\win32;$(LibraryPath)</LibraryPath>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <IncludePath>$(ProjectDir)\..\..\include;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)\..\..\lib\win32;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <IncludePath>$(ProjectDir)\..\..\include;$(IncludePath)</IncludePath>
    <LibraryPath>$(ProjectDir)\..\..\lib\win32;$(LibraryPath)</LibraryPath>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <IncludePath>$(ProjectDir)\..\..\include;$(IncludePath)</IncludePath>
+    <LibraryPath>$(ProjectDir)\..\..\lib\win32;$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
      <PrecompiledHeader>
@ -69,6 +104,26 @@
    <PreBuildEvent>
    </PreBuildEvent>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level4</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>CURL_STATICLIB;CPP_LIB_DEBUG=1;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+    <Lib>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+    <PreBuildEvent />
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@ -93,6 +148,30 @@
      <AdditionalOptions>/NODEFAULTLIB:library %(AdditionalOptions)</AdditionalOptions>
    </Lib>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>CPP_LIB_DEBUG;CURL_STATICLIB;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <SDLCheck>true</SDLCheck>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <AdditionalIncludeDirectories>$(ProjectDir)\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalOptions>/NODEFAULTLIB:library %(AdditionalOptions)</AdditionalOptions>
+    </Lib>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\src\core\BaseTelemetryContext.h" />
    <ClInclude Include="..\..\..\src\core\channel\TelemetryChannel.h" />
--- a/Projects/AppInsights_Win32/package/AppInsights_Win32.autopkg
+++ b/Projects/AppInsights_Win32/package/AppInsights_Win32.autopkg
@ -0,0 +1,80 @@
+configurations
+{
+	Toolset
+	{
+		key : "PlatformToolset";
+		choices : { v140, v120, v110 };
+	};
+};
+
+nuget
+{
+	nuspec
+	{
+		id : AppInsights_Win32;
+		version : 1.0.0-beta-1;
+		title : Microsoft Application Insights Library for C++;
+		authors: { Microsoft };
+		owners: { Microsoft };
+		licenseUrl: "https://github.com/Microsoft/ApplicationInsights-CPP/blob/master/LICENSE";
+		iconUrl: "http://appanacdn.blob.core.windows.net/cdn/icons/aic.png";
+		requireLicenseAcceptance:false;
+		summary: Microsoft Application Insights Library for C++;
+		description: @"Application Insights for C++ applications.
+		See http://go.microsoft.com/fwlink/?LinkID=510752 for more information.
+		Project on Githib: https://github.com/Microsoft/ApplicationInsights-CPP
+		Fork on Github: https://github.com/keiichi-morisato/ApplicationInsights-CPP";
+		releaseNotes: "This package includes both the release and the debug versions of the library to allow for debugging. The PDB files are also included.";
+		projectUrl: "https://azure.microsoft.com/en-us/documentation/articles/app-insights-get-started/";
+		copyright: Copyright (c) Microsoft. All rights reserved;
+		tags: { Analytics, ApplicationInsights, Telemetry, AppInsights, native };
+	};
+ 
+	dependencies
+	{
+		packages:
+		{
+		};
+	};
+
+	files
+	{
+		include:
+		{
+			..\..\..\src\core\*.h;
+			..\..\..\src\core\channel\*.h;
+			..\..\..\src\core\channel\utils\*.h;
+			..\..\..\src\core\common\*.h;
+			..\..\..\src\core\contracts\*.h;
+		};
+ 
+		[x64,v140,v120,release,static]
+		{
+			lib:
+			{
+				..\x64\Release\core.lib;
+			}
+			symbols:
+			{
+			}
+			bin:
+			{
+			}
+		};
+
+		[x64,v140,v120,debug,static]
+		{
+			lib:
+			{
+				..\x64\Debug\core.lib;
+			}
+			symbols:
+			{
+				..\x64\Debug\core.pdb;
+			}
+			bin:
+			{
+			}
+		};
+	};
+}
--- a/Projects/AppInsights_Win32/package/README.md
+++ b/Projects/AppInsights_Win32/package/README.md
@ -0,0 +1,27 @@
+Build and Package Notes
+=======================
+
+# Build
+
+- Visual Studio 2015 Community Edition or Pro/Enterprise.
+- Windows Vista x64 or better.
+- Powershell 3.0 or better.
+- You will need the [CoApp Powershell Tools](http://coapp.org/index.html) which can be downloaded from this [link](http://coapp.org/files/CoApp.Tools.Powershell.msi).
+- If you are using Nuget to publish, you will need to update the package.ps1 file with the server and your ApiKey.
+
+## How-to
+
+1. Change to the `package/` directory under `ApplicationInsights-CPP/Projects/AppInsights_Win32/`
+1. Run the `build.bat` file from the Visual Studio Command Prompt (x64 build environment).
+
+
+```
+
+```
+
+## Package
+
+
+
+# References
+
--- a/Projects/AppInsights_Win32/package/build.bat
+++ b/Projects/AppInsights_Win32/package/build.bat
@ -0,0 +1,13 @@
+@echo off
+@echo ..............................................................................
+@echo Restoring the nuget packages..
+nuget restore ..\application_insights.sln
+@echo ..............................................................................
+@echo Building the debug version..
+msbuild /t:Rebuild /p:Configuration=Debug ../application_insights.sln /m
+@echo ..............................................................................
+@echo Building the releaseversion..
+msbuild /t:Rebuild /p:Configuration=Release ../application_insights.sln /m
+@echo ..............................................................................
+@echo Packaging..
+rem powershell -File .\package.ps1
--- a/Projects/AppInsights_Win32/test/core.tests.vcxproj
+++ b/Projects/AppInsights_Win32/test/core.tests.vcxproj
@ -1,14 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|Win32">
      <Configuration>Debug</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
    <ProjectConfiguration Include="Release|Win32">
      <Configuration>Release</Configuration>
      <Platform>Win32</Platform>
    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <ProjectGuid>{D9D00C85-E6BA-496E-AC7E-C3744AD38194}</ProjectGuid>
@ -19,14 +27,29 @@
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v120</PlatformToolset>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+    <UseOfMfc>false</UseOfMfc>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
    <CharacterSet>Unicode</CharacterSet>
    <UseOfMfc>false</UseOfMfc>
@ -37,19 +60,35 @@
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <LinkIncremental>false</LinkIncremental>
    <IncludePath>$(ProjectDir)\..\..\..\src\core;$(IncludePath)</IncludePath>
    <LibraryPath>$(LibraryPath)</LibraryPath>
  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <IncludePath>$(ProjectDir)\..\..\..\src\core;$(IncludePath)</IncludePath>
+    <LibraryPath>$(LibraryPath)</LibraryPath>
+  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <LinkIncremental>true</LinkIncremental>
    <LibraryPath>$(ProjectDir)\..\..\lib\win32;$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)\..\..\include;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\..\src\core;$(IncludePath)</IncludePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <LibraryPath>$(ProjectDir)\..\..\lib\win32;$(LibraryPath)</LibraryPath>
+    <IncludePath>$(ProjectDir)\..\..\include;$(ProjectDir)\..\..\..\src\core;$(IncludePath)</IncludePath>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
@ -71,6 +110,25 @@
    <PreBuildEvent>
    </PreBuildEvent>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\src\core;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <UseFullPaths>true</UseFullPaths>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>ws2_32.lib;Wldap32.lib;Winhttp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
+    </Link>
+    <PreBuildEvent />
+  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <WarningLevel>Level3</WarningLevel>
@ -92,6 +150,27 @@
      <AdditionalDependencies>ws2_32.lib;Wldap32.lib;Winhttp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\..\src\core;$(ProjectDir)..\..\src\core\Contracts;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <UseFullPaths>true</UseFullPaths>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>ws2_32.lib;Wldap32.lib;Winhttp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\test\core\specializations.h" />
    <ClInclude Include="..\..\..\test\core\targetver.h" />