diff options
| -rw-r--r-- | windows/winnet/src/extras/tests/adaptermonitor.cpp | 116 | ||||
| -rw-r--r-- | windows/winnet/src/extras/tests/testadapterutil.cpp | 12 | ||||
| -rw-r--r-- | windows/winnet/src/extras/tests/testadapterutil.h | 7 | ||||
| -rw-r--r-- | windows/winnet/src/extras/tests/tests.vcxproj | 90 |
4 files changed, 64 insertions, 161 deletions
diff --git a/windows/winnet/src/extras/tests/adaptermonitor.cpp b/windows/winnet/src/extras/tests/adaptermonitor.cpp index bfb3da8d5e..465bb0b7cd 100644 --- a/windows/winnet/src/extras/tests/adaptermonitor.cpp +++ b/windows/winnet/src/extras/tests/adaptermonitor.cpp @@ -1,39 +1,21 @@ #include "stdafx.h" #include "testadapterutil.h" +#include <libshared/logging/stdoutlogger.h> +#include <libshared/logging/logsinkadapter.h> #include <iostream> - #include <CppUnitTest.h> -#include <libcommon/trace/trace.h> using namespace Microsoft::VisualStudio::CppUnitTestFramework; namespace { - -void logFunc(common::logging::Severity severity, const char *msg) -{ - using common::logging::Severity; - - switch (severity) - { - case Severity::Error: - std::cout << "Error: "; - break; - case Severity::Warning: - std::cout << "Warning: "; - break; - case Severity::Info: - std::cout << "Info: "; - break; - case Severity::Trace: - std::cout << "Trace: "; - break; - } - std::cout << msg << std::endl; +auto MakeStdoutLogger() +{ + return std::make_shared<shared::logging::LogSinkAdapter>(shared::logging::StdoutLogger, nullptr); } - + enum class LastEvent { NoEvent, @@ -48,7 +30,7 @@ namespace Microsoft::VisualStudio::CppUnitTestFramework { template<> -static std::wstring ToString<LastEvent>(const enum class LastEvent& t) +std::wstring ToString<LastEvent>(const enum class LastEvent& t) { switch (t) { @@ -72,9 +54,9 @@ public: TEST_METHOD(addAdapter) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -84,7 +66,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -93,7 +75,7 @@ public: ); Assert::AreEqual( - 0ULL, + size_t(0), adapterCount, L"Expected 0 adapters initially" ); @@ -117,7 +99,7 @@ public: testProvider->sendEvent(&iface, MibAddInstance); Assert::AreEqual( - 1ULL, + size_t(1), adapterCount, L"Expected new adapter" ); @@ -125,9 +107,9 @@ public: TEST_METHOD(addAdapter_Duplicate) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -137,7 +119,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -162,7 +144,7 @@ public: testProvider->sendEvent(&iface, MibAddInstance); Assert::AreEqual( - 1ULL, + size_t(1), adapterCount, L"Expected new adapter" ); @@ -173,7 +155,7 @@ public: testProvider->sendEvent(&iface, MibAddInstance); Assert::AreEqual( - 1ULL, + size_t(1), adapterCount, L"Expected ignored duplicate interface event" ); @@ -181,9 +163,9 @@ public: TEST_METHOD(removeAdapter_AdminStatus) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -193,7 +175,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -235,7 +217,7 @@ public: testProvider->removeAdapter(adapter); Assert::AreEqual( - 0ULL, + size_t(0), adapterCount, L"Expected removed adapter" ); @@ -243,9 +225,9 @@ public: TEST_METHOD(removeAdapter_NoInterfaces) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -255,7 +237,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -299,7 +281,7 @@ public: testProvider->removeAdapter(adapter); Assert::AreEqual( - 0ULL, + size_t(0), adapterCount, L"Expected removed adapter" ); @@ -307,9 +289,9 @@ public: TEST_METHOD(removeAdapter_Duplicate) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -319,7 +301,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -343,7 +325,7 @@ public: testProvider->sendEvent(&iface, MibAddInstance); Assert::AreEqual( - 1ULL, + size_t(1), adapterCount, L"Expected new adapter" ); @@ -363,7 +345,7 @@ public: testProvider->sendEvent(&iface, MibDeleteInstance); Assert::AreEqual( - 0ULL, + size_t(0), adapterCount, L"State inconsistent after duplicate Delete event" ); @@ -371,9 +353,9 @@ public: TEST_METHOD(addIPv6Interface) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -383,7 +365,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -410,7 +392,7 @@ public: testProvider->sendEvent(&iface, MibAddInstance); Assert::AreEqual( - 1ULL, + size_t(1), adapterCount, L"Expected new adapter" ); @@ -418,9 +400,9 @@ public: TEST_METHOD(addIPv4And6Interface) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -430,7 +412,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -474,9 +456,9 @@ public: TEST_METHOD(addIPv4And6Interface_RemoveIPv4) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -486,7 +468,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -537,9 +519,9 @@ public: TEST_METHOD(addIPv4And6Interface_RemoveIPv6) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -549,7 +531,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -600,9 +582,9 @@ public: TEST_METHOD(addIPv4And6Interface_RemoveBoth) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); - const auto filter = [](const MIB_IF_ROW2 &row) -> bool + const auto filter = [](const MIB_IF_ROW2 &) -> bool { return true; }; @@ -612,7 +594,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType) -> void { adapterCount = adapters.size(); }, @@ -665,7 +647,7 @@ public: TEST_METHOD(filter) { - auto logSink = std::make_shared<common::logging::LogSink>(logFunc); + auto logSink = MakeStdoutLogger(); const auto testProvider = std::make_shared<TestDataProvider>(); @@ -697,7 +679,7 @@ public: NetworkAdapterMonitor inst( logSink, - [&adapterCount, &lastEvent](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *adapter, UpdateType updateType) -> void + [&adapterCount, &lastEvent](const std::vector<MIB_IF_ROW2> &adapters, const MIB_IF_ROW2 *, UpdateType updateType) -> void { switch (updateType) { @@ -746,7 +728,7 @@ public: Assert::AreEqual(LastEvent::NoEvent, lastEvent, L"Unexpectedly received event for loopback adapter"); Assert::AreEqual( - 0ULL, + size_t(0), adapterCount, L"Loopback adapter was not filtered correctly" ); diff --git a/windows/winnet/src/extras/tests/testadapterutil.cpp b/windows/winnet/src/extras/tests/testadapterutil.cpp index 09d488bc27..128cbee681 100644 --- a/windows/winnet/src/extras/tests/testadapterutil.cpp +++ b/windows/winnet/src/extras/tests/testadapterutil.cpp @@ -1,13 +1,11 @@ #include "stdafx.h" - #include "testadapterutil.h" - #include <CppUnitTest.h> using namespace Microsoft::VisualStudio::CppUnitTestFramework; #include <libcommon/logging/logsink.h> -#include "../../winnet/networkadaptermonitor.h" +#include <winnet/networkadaptermonitor.h> using FilterType = NetworkAdapterMonitor::FilterType; using UpdateSinkType = NetworkAdapterMonitor::UpdateSinkType; @@ -63,11 +61,11 @@ void MibIfTable::remove(const MIB_IF_ROW2 &row) // DWORD TestDataProvider::notifyIpInterfaceChange( - ADDRESS_FAMILY Family, + ADDRESS_FAMILY, PIPINTERFACE_CHANGE_CALLBACK Callback, PVOID CallerContext, - BOOLEAN InitialNotification, - HANDLE *NotificationHandle + BOOLEAN, + HANDLE * ) { // TODO: assert: m_callback == nullptr @@ -78,7 +76,7 @@ DWORD TestDataProvider::notifyIpInterfaceChange( return NO_ERROR; } -DWORD TestDataProvider::cancelMibChangeNotify2(HANDLE NotificationHandle) +DWORD TestDataProvider::cancelMibChangeNotify2(HANDLE) { // TODO: assert: m_callback != nullptr // TODO: multiple callbacks? diff --git a/windows/winnet/src/extras/tests/testadapterutil.h b/windows/winnet/src/extras/tests/testadapterutil.h index 4b4ae80799..5ae8cc32c2 100644 --- a/windows/winnet/src/extras/tests/testadapterutil.h +++ b/windows/winnet/src/extras/tests/testadapterutil.h @@ -1,11 +1,8 @@ #pragma once #include <functional> - -#include <WinSock2.h> - -#include <libcommon/logging/logsink.h> -#include "../../winnet/networkadaptermonitor.h" +#include <winSock2.h> +#include <winnet/networkadaptermonitor.h> using FilterType = NetworkAdapterMonitor::FilterType; using UpdateSinkType = NetworkAdapterMonitor::UpdateSinkType; diff --git a/windows/winnet/src/extras/tests/tests.vcxproj b/windows/winnet/src/extras/tests/tests.vcxproj index 6a332a9f48..d9afdea25e 100644 --- a/windows/winnet/src/extras/tests/tests.vcxproj +++ b/windows/winnet/src/extras/tests/tests.vcxproj @@ -5,18 +5,10 @@ <Configuration>Debug</Configuration> <Platform>Win32</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> <ProjectConfiguration Include="Debug|x64"> <Configuration>Debug</Configuration> <Platform>x64</Platform> </ProjectConfiguration> - <ProjectConfiguration Include="Release|x64"> - <Configuration>Release</Configuration> - <Platform>x64</Platform> - </ProjectConfiguration> </ItemGroup> <PropertyGroup Label="Globals"> <VCProjectVersion>16.0</VCProjectVersion> @@ -35,14 +27,6 @@ <CharacterSet>Unicode</CharacterSet> <UseOfMfc>false</UseOfMfc> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <UseOfMfc>false</UseOfMfc> - </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> @@ -50,14 +34,6 @@ <CharacterSet>Unicode</CharacterSet> <UseOfMfc>false</UseOfMfc> </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> - <ConfigurationType>DynamicLibrary</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v142</PlatformToolset> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <UseOfMfc>false</UseOfMfc> - </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -66,15 +42,9 @@ <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 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 Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <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|x64'"> - <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|x64'"> <LinkIncremental>true</LinkIncremental> @@ -83,21 +53,15 @@ </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <LinkIncremental>true</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>true</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <LinkIncremental>true</LinkIncremental> - <IntDir>$(SolutionDir)bin\temp\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir> <OutDir>$(SolutionDir)bin\$(Platform)-$(Configuration)\</OutDir> + <IntDir>$(SolutionDir)bin\temp\$(Platform)-$(Configuration)\$(ProjectName)\</IntDir> </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(SolutionDir)..\windows-libraries\src;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)../../;$(ProjectDir)../../../../libshared/src;$(ProjectDir)../../../../windows-libraries/src;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <UseFullPaths>true</UseFullPaths> <LanguageStandard>stdcpplatest</LanguageStandard> @@ -106,60 +70,24 @@ <Link> <SubSystem>Windows</SubSystem> <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration);$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>libcommon.lib;Iphlpapi.lib;winnet-static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libshared.lib;libcommon.lib;winnet-static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <PrecompiledHeader>Use</PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> + <WarningLevel>Level4</WarningLevel> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>$(ProjectDir)../../;$(ProjectDir)../../../../libshared/src;$(ProjectDir)../../../../windows-libraries/src;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <UseFullPaths>true</UseFullPaths> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader>Use</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UseFullPaths>true</UseFullPaths> - </ClCompile> - <Link> - <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader>Use</PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <AdditionalIncludeDirectories>$(SolutionDir)..\windows-libraries\src;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> - <UseFullPaths>true</UseFullPaths> <LanguageStandard>stdcpplatest</LanguageStandard> - <RuntimeLibrary>MultiThreaded</RuntimeLibrary> + <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> </ClCompile> <Link> <SubSystem>Windows</SubSystem> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> <AdditionalLibraryDirectories>$(SolutionDir)/bin/$(Platform)-$(Configuration);$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> - <AdditionalDependencies>libcommon.lib;winnet.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> + <AdditionalDependencies>libshared.lib;libcommon.lib;winnet-static.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> </Link> </ItemDefinitionGroup> <ItemGroup> @@ -171,8 +99,6 @@ <ClCompile Include="stdafx.cpp"> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader> <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader> - <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader> </ClCompile> <ClCompile Include="adaptermonitor.cpp" /> <ClCompile Include="testadapterutil.cpp" /> |