Skip to content
This repository was archived by the owner on Nov 15, 2021. It is now read-only.

a number of changes/fixes #336

Merged
sawilde merged 13 commits into from
Aug 9, 2015
Merged

a number of changes/fixes #336

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
79e0805
some readability refactoring and tidy up
sawilde Feb 13, 2015
fc68f07
wip
sawilde Mar 10, 2015
09b7b84
remove dependency on static libs [makes future platform SDK upgrades …
sawilde Aug 5, 2015
374295a
Merge branch 'master' into launch_244
sawilde Aug 8, 2015
4cde072
Merge branch 'master' into corefx_1103
sawilde Aug 8, 2015
1452818
#329 address ArgumentOutOfRangeException (potentially related to #274)
sawilde Aug 8, 2015
69b39e2
quick tidy up, keep send buffer functionality in one place
sawilde Aug 8, 2015
77752f3
fix up release build
sawilde Aug 8, 2015
95495b7
error on unrecognized arguments/prefixes #335
sawilde Aug 8, 2015
66b0344
exclude nested types when declared type is excluded #328
sawilde Aug 8, 2015
65611d3
ignore branches in known autogenerated sequences #310
sawilde Aug 9, 2015
98bd0f0
ignore branches in known autogenerated sequences #302
sawilde Aug 9, 2015
99a9528
Merge branch 'master' of github.com:sawilde/opencover
sawilde Aug 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove dependency on static libs [makes future platform SDK upgrades … 
…easier]
  • Loading branch information
@sawilde
sawilde committed Aug 5, 2015
commit 09b7b842002078783d3de3b39ce331ebd6aa1ce6
10 changes: 6 additions & 4 deletions main/OpenCover.Test.Profiler/OpenCover.Test.Profiler.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,13 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>..\..\tools\gtest-1.6.0\include;$(IncludePath)</IncludePath>
<IncludePath>$(IncludePath)</IncludePath>
<LibraryPath>$(MSBuildProjectDirectory)\..\..\tools\gtest-1.6.0\msvc\gtest\$(Configuration);$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>..\..\tools\gtest-1.6.0\include;$(IncludePath)</IncludePath>
<IncludePath>$(IncludePath)</IncludePath>
<LibraryPath>$(MSBuildProjectDirectory)\..\..\tools\gtest-1.6.0\msvc\gtest\$(Configuration);$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
</PropertyGroup>
Expand All @@ -60,11 +60,12 @@
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\tools\gtest-1.6.0\include;..\..\tools\gtest-1.6.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalDependencies>gtestd.lib;gtest_maind.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
Expand All @@ -77,13 +78,14 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>TEST_FRAMEWORK;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);_VARIADIC_MAX=10</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<AdditionalIncludeDirectories>..\..\tools\gtest-1.6.0\include;..\..\tools\gtest-1.6.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>gtest.lib;gtest_main.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
<IgnoreSpecificDefaultLibraries>%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
</Link>
</ItemDefinitionGroup>
Expand Down
12 changes: 12 additions & 0 deletions main/OpenCover.Test.Profiler/stdafx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,15 @@

// TODO: reference any additional headers you need in STDAFX.H
// and not in this file


// The following lines pull in the real gtest *.cc files.
#include "..\..\tools\gtest-1.6.0\src\gtest.cc"
#include "..\..\tools\gtest-1.6.0\src\gtest-death-test.cc"
#include "..\..\tools\gtest-1.6.0\src\gtest-filepath.cc"
#include "..\..\tools\gtest-1.6.0\src\gtest-port.cc"
#include "..\..\tools\gtest-1.6.0\src\gtest-printers.cc"
#include "..\..\tools\gtest-1.6.0\src\gtest-test-part.cc"
#include "..\..\tools\gtest-1.6.0\src\gtest-typed-test.cc"

#include "..\..\tools\gtest-1.6.0\src\gtest_main.cc"
Binary file modified tools/gtest-1.6.0.zip
View file
Open in desktop
Binary file not shown.