Fix building unit and functional tests from command line
This commit is contained in:
Max Golovanov
Родитель
1afa52c8de
Коммит
e06cca7b44
|
|
@ -243,9 +243,6 @@
|
|||
<ProjectReference Include="..\..\win32-dll\win32-dll.vcxproj">
|
||||
<Project>{216a8e97-21f7-4bef-9e52-7f772c177c32}</Project>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\win32-static\win32-static.vcxproj">
|
||||
<Project>{82c8ee9a-f706-4a97-9eea-1d7b5fc9e6db}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(SolutionDir)\build.props" Condition="Exists('$(SolutionDir)\build.props')" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
|
|
|
|||
|
|
@ -1,259 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<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="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>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="$(ProjectDir)..\VersionInfo.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="$(SolutionDir)\PAL\win32\WindowsEnvironmentInfo.h" />
|
||||
<ClInclude Include="..\net40\targetver.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\sqlite\sqlite.vcxproj">
|
||||
<Project>{2ebc7b3c-2af1-442c-9285-cab39bbb8c00}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectGuid>{82C8EE9A-F706-4A97-9EEA-1D7B5FC9E6DB}</ProjectGuid>
|
||||
<Keyword>Win32DllProj</Keyword>
|
||||
<RootNamespace>ClientTelemetry</RootNamespace>
|
||||
<ProjectName>win32-static</ProjectName>
|
||||
<WindowsTargetPlatformVersion>10.0.15005.0</WindowsTargetPlatformVersion>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<QBConfigId>win-x86_vs2015-crtdynamic-debug</QBConfigId>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<QBConfigId>win-x86_vs2015-crtdynamic-release</QBConfigId>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<QBConfigId>win-x64_vs2015-crtdynamic-debug</QBConfigId>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v140</PlatformToolset>
|
||||
<WholeProgramOptimization>false</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<QBConfigId>win-x64_vs2015-crtdynamic-release</QBConfigId>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
</ImportGroup>
|
||||
<ImportGroup Label="Shared">
|
||||
<Import Project="$(SolutionDir)\ssl-stubs\ssl-stubs.vcxitems" Label="Shared" />
|
||||
<Import Project="$(SolutionDir)\PAL\win32\win32.vcxitems" Label="Shared" />
|
||||
<Import Project="..\..\clienttelemetry.vcxitems" Label="Shared" />
|
||||
</ImportGroup>
|
||||
<ImportGroup 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>
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<TargetName>ClientTelemetry</TargetName>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.pdb;*.obj.enc;*.ilk;*.ipdb;*.iobj;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
|
||||
<IncludePath>$(SolutionDir)\..\sqlite;$(VC_IncludePath);$(SolutionDir)\..;$(SolutionDir)\..\ctsdk;$(SolutionDir)\PAL.Shared</IncludePath>
|
||||
<LibraryPath>$(AriaDepsLibPath);$(LibraryPath)</LibraryPath>
|
||||
<LibraryWPath />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.pdb;*.obj.enc;*.ilk;*.ipdb;*.iobj;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
|
||||
<IncludePath>$(SolutionDir)\..\sqlite;$(VC_IncludePath);$(SolutionDir)\..;$(SolutionDir)\..\ctsdk;$(SolutionDir)\PAL.Shared</IncludePath>
|
||||
<LibraryPath>$(AriaDepsLibPath);$(LibraryPath)</LibraryPath>
|
||||
<LibraryWPath />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.pdb;*.obj.enc;*.ilk;*.ipdb;*.iobj;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
|
||||
<IncludePath>$(SolutionDir)\..\sqlite;$(VC_IncludePath);$(SolutionDir)\..;$(SolutionDir)\..\ctsdk;$(SolutionDir)\PAL.Shared</IncludePath>
|
||||
<LibraryPath>$(AriaDepsLibPath);$(LibraryPath)</LibraryPath>
|
||||
<LibraryWPath />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ExtensionsToDeleteOnClean>*.cdf;*.cache;*.obj;*.pdb;*.obj.enc;*.ilk;*.ipdb;*.iobj;*.resources;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;*.tlog;*.manifest;*.res;*.pch;*.exp;*.idb;*.rep;*.xdc;*.pdb;*_manifest.rc;*.bsc;*.sbr;*.xml;*.metagen;*.bi</ExtensionsToDeleteOnClean>
|
||||
<IncludePath>$(SolutionDir)\..\sqlite;$(VC_IncludePath);$(SolutionDir)\..;$(SolutionDir)\..\ctsdk;$(SolutionDir)\PAL.Shared</IncludePath>
|
||||
<LibraryPath>$(AriaDepsLibPath);$(LibraryPath)</LibraryPath>
|
||||
<LibraryWPath />
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
|
||||
<ClCompile>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<PreprocessorDefinitions>_ARIA_UTC_SDK;NO_ROAM_SUP;USE_TIMERSHIM2;USE_SQLITE;_WIN32_WINNT=0x0601;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..;..\..\include;..\..\src;..\..\internal;..\..\common;..\..\src\SemanticApi\src\datamodel;..\..\src\SemanticApi\physical\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
|
||||
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsManaged>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NoListing</AssemblerOutput>
|
||||
<AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NoListing</AssemblerOutput>
|
||||
<CompileAsManaged Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsManaged>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</BrowseInformation>
|
||||
<BrowseInformation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</BrowseInformation>
|
||||
<RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<RuntimeLibrary Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">4503</DisableSpecificWarnings>
|
||||
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">4503</DisableSpecificWarnings>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalDependencies>msxml6.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<DelayLoadDLLs>
|
||||
</DelayLoadDLLs>
|
||||
<ForceFileOutput>
|
||||
</ForceFileOutput>
|
||||
<EntryPointSymbol>
|
||||
</EntryPointSymbol>
|
||||
<LinkStatus>false</LinkStatus>
|
||||
<GenerateMapFile>true</GenerateMapFile>
|
||||
<CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
|
||||
<LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
|
||||
<ShowProgress>LinkVerboseLib</ShowProgress>
|
||||
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</IgnoreSpecificDefaultLibraries>
|
||||
<IgnoreAllDefaultLibraries Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</IgnoreAllDefaultLibraries>
|
||||
<IgnoreAllDefaultLibraries Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</IgnoreAllDefaultLibraries>
|
||||
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</IgnoreSpecificDefaultLibraries>
|
||||
<OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</OptimizeReferences>
|
||||
<OptimizeReferences Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</OptimizeReferences>
|
||||
<GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateWindowsMetadata>
|
||||
<GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateWindowsMetadata>
|
||||
<TurnOffAssemblyGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</TurnOffAssemblyGeneration>
|
||||
<TurnOffAssemblyGeneration Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</TurnOffAssemblyGeneration>
|
||||
</Link>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>true</LinkLibraryDependencies>
|
||||
<UseLibraryDependencyInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</UseLibraryDependencyInputs>
|
||||
<UseLibraryDependencyInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</UseLibraryDependencyInputs>
|
||||
</ProjectReference>
|
||||
<Lib>
|
||||
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"></AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<TargetMachine Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">MachineX86</TargetMachine>
|
||||
</Lib>
|
||||
<Bscmake>
|
||||
<PreserveSbr Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</PreserveSbr>
|
||||
</Bscmake>
|
||||
<Lib>
|
||||
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"></AdditionalDependencies>
|
||||
</Lib>
|
||||
<Lib>
|
||||
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level3</WarningLevel>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
<!-- FIXME: x64 bit - no optimizations -->
|
||||
<Optimization Condition="'$(Platform)'!='x64'">MinSpace</Optimization>
|
||||
<FavorSizeOrSpeed Condition="'$(Platform)'!='x64'">Size</FavorSizeOrSpeed>
|
||||
<!-- x86: optimize for size -->
|
||||
<Optimization Condition="'$(Platform)'=='x64'">Disabled</Optimization>
|
||||
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||
<IntrinsicFunctions>false</IntrinsicFunctions>
|
||||
<PreprocessorDefinitions>_ARIA_UTC_SDK;NO_ROAM_SUP;USE_TIMERSHIM2;USE_SQLITE;_WIN32_WINNT=0x0601;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;USE_BOND;BOND_COMPACT_BINARY_PROTOCOL;WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<AdditionalIncludeDirectories>..\..;..\..\include;..\..\src;..\..\internal;..\..\common;..\..\src\SemanticApi\src\datamodel;..\..\src\SemanticApi\physical\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<CompileAsManaged>false</CompileAsManaged>
|
||||
<CompileAsWinRT>false</CompileAsWinRT>
|
||||
<AssemblerOutput>NoListing</AssemblerOutput>
|
||||
<GenerateXMLDocumentationFiles>false</GenerateXMLDocumentationFiles>
|
||||
<BrowseInformation>false</BrowseInformation>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|x64'">4503</DisableSpecificWarnings>
|
||||
<DisableSpecificWarnings Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">4503</DisableSpecificWarnings>
|
||||
<WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</WholeProgramOptimization>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<AdditionalDependencies>msxml6.lib;wininet.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<DelayLoadDLLs>
|
||||
</DelayLoadDLLs>
|
||||
<ForceFileOutput>
|
||||
</ForceFileOutput>
|
||||
<EntryPointSymbol>
|
||||
</EntryPointSymbol>
|
||||
<LinkStatus>false</LinkStatus>
|
||||
<GenerateMapFile>true</GenerateMapFile>
|
||||
<CLRUnmanagedCodeCheck>false</CLRUnmanagedCodeCheck>
|
||||
<ShowProgress>LinkVerboseLib</ShowProgress>
|
||||
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</IgnoreSpecificDefaultLibraries>
|
||||
<IgnoreAllDefaultLibraries Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</IgnoreAllDefaultLibraries>
|
||||
<IgnoreAllDefaultLibraries Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</IgnoreAllDefaultLibraries>
|
||||
<IgnoreSpecificDefaultLibraries Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</IgnoreSpecificDefaultLibraries>
|
||||
<LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Default</LinkTimeCodeGeneration>
|
||||
<LinkTimeCodeGeneration Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Default</LinkTimeCodeGeneration>
|
||||
<GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateWindowsMetadata>
|
||||
<GenerateWindowsMetadata Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateWindowsMetadata>
|
||||
<TurnOffAssemblyGeneration Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</TurnOffAssemblyGeneration>
|
||||
<TurnOffAssemblyGeneration Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</TurnOffAssemblyGeneration>
|
||||
</Link>
|
||||
<ProjectReference>
|
||||
<LinkLibraryDependencies>true</LinkLibraryDependencies>
|
||||
<UseLibraryDependencyInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</UseLibraryDependencyInputs>
|
||||
<UseLibraryDependencyInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</UseLibraryDependencyInputs>
|
||||
</ProjectReference>
|
||||
<Lib>
|
||||
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"></AdditionalDependencies>
|
||||
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<TargetMachine Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">MachineX86</TargetMachine>
|
||||
</Lib>
|
||||
<Lib>
|
||||
<AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|x64'"></AdditionalDependencies>
|
||||
</Lib>
|
||||
<Lib>
|
||||
<AdditionalLibraryDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
</Lib>
|
||||
</ItemDefinitionGroup>
|
||||
<Import Project="$(SolutionDir)\build.props" Condition="Exists('$(SolutionDir)\build.props')" />
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ItemGroup>
|
||||
<Filter Include="Resource Files">
|
||||
<UniqueIdentifier>{7ff9cecd-1aea-4d2e-8861-35796c83e915}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="$(SolutionDir)\PAL\win32\WindowsEnvironmentInfo.h" />
|
||||
<ClInclude Include="..\net40\targetver.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="$(SolutionDir)\VersionInfo.rc">
|
||||
<Filter>Resource Files</Filter>
|
||||
</ResourceCompile>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -1,27 +1,14 @@
|
|||
@echo off
|
||||
call tools\gen-version.cmd
|
||||
@setlocal ENABLEEXTENSIONS
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
|
||||
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo ** Building projects using MSBuild... **
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo "Building using Visual Studio 2017 tools"
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
|
||||
|
||||
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
|
||||
set platform=
|
||||
set SOLUTION=Solutions\AriaSDK.sln
|
||||
|
||||
REM Disable parallel builds for now because of a vs2013 bug that randomly triggers :
|
||||
REM cl : Command line error D8040: error creating or communicating with child process
|
||||
REM Start in clienttelemetry
|
||||
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo ** Creating Win32 Debug ... **
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
msbuild Solutions\AriaSDK.sln /target:build\build-sdk /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=Win32
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,gmock,gtest,UnitTests,FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=Win32
|
||||
Solutions\out\Debug\Win32\UnitTests\UnitTests.exe
|
||||
Solutions\out\Debug\Win32\FuncTests\FuncTests.exe
|
||||
|
||||
|
|
|
|||
|
|
@ -1,26 +1,14 @@
|
|||
@echo off
|
||||
call tools\gen-version.cmd
|
||||
@setlocal ENABLEEXTENSIONS
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
|
||||
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo ** Building projects using MSBuild... **
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo "Building using Visual Studio 2017 tools"
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
|
||||
|
||||
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
|
||||
set platform=
|
||||
set SOLUTION=Solutions\AriaSDK.sln
|
||||
|
||||
REM Disable parallel builds for now because of a vs2013 bug that randomly triggers :
|
||||
REM cl : Command line error D8040: error creating or communicating with child process
|
||||
REM Start in clienttelemetry
|
||||
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo ** Creating Win32 Release ... **
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
msbuild Solutions\AriaSDK.sln /target:build\build-sdk /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=Win32
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=Win32
|
||||
Solutions\out\Release\Win32\UnitTests\UnitTests.exe
|
||||
Solutions\out\Release\Win32\FuncTests\FuncTests.exe
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
|
|||
set platform=
|
||||
set SOLUTION=Solutions\AriaSDK.sln
|
||||
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-static,net40,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=Win32
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-static,net40,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=Win32
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,UnitTests,FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=Win32
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,UnitTests,FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=Win32
|
||||
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-static,net40,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-static,net40,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,UnitTests,FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,UnitTests,FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64
|
||||
|
||||
msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=ARM
|
||||
msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=ARM
|
||||
|
|
|
|||
|
|
@ -1,26 +1,14 @@
|
|||
@echo off
|
||||
call tools\gen-version.cmd
|
||||
@setlocal ENABLEEXTENSIONS
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
|
||||
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo ** Building projects using MSBuild... **
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo "Building using Visual Studio 2017 tools"
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
|
||||
|
||||
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
|
||||
set platform=
|
||||
set SOLUTION=Solutions\AriaSDK.sln
|
||||
|
||||
REM Disable parallel builds for now because of a vs2013 bug that randomly triggers :
|
||||
REM cl : Command line error D8040: error creating or communicating with child process
|
||||
REM Start in clienttelemetry
|
||||
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo ** Creating x64 Debug ... **
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
msbuild Solutions\AriaSDK.sln /target:build\build-sdk /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,gmock,gtest,UnitTests,FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Debug /p:Platform=x64
|
||||
Solutions\out\Debug\x64\UnitTests\UnitTests.exe
|
||||
Solutions\out\Debug\x64\FuncTests\FuncTests.exe
|
||||
|
|
|
|||
|
|
@ -1,26 +1,14 @@
|
|||
@echo off
|
||||
call tools\gen-version.cmd
|
||||
@setlocal ENABLEEXTENSIONS
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat"
|
||||
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo ** Building projects using MSBuild... **
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo "Building using Visual Studio 2017 tools"
|
||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\VsDevCmd.bat"
|
||||
|
||||
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
|
||||
set platform=
|
||||
set SOLUTION=Solutions\AriaSDK.sln
|
||||
|
||||
REM Disable parallel builds for now because of a vs2013 bug that randomly triggers :
|
||||
REM cl : Command line error D8040: error creating or communicating with child process
|
||||
REM Start in clienttelemetry
|
||||
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
echo ** Creating x64 Release ... **
|
||||
echo ***************************************************************************************************
|
||||
echo ***************************************************************************************************
|
||||
msbuild Solutions\AriaSDK.sln /target:build\build-sdk /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64
|
||||
msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,gmock,gtest,UnitTests,FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /detailedsummary /p:Configuration=Release /p:Platform=x64
|
||||
Solutions\out\Release\x64\UnitTests\UnitTests.exe
|
||||
Solutions\out\Release\x64\FuncTests\FuncTests.exe
|
||||
|
|
@ -2,8 +2,8 @@
|
|||
// WARNING: DO NOT MODIFY THIS FILE!
|
||||
// Copyright (c) Microsoft. All rights reserved.
|
||||
// This file has been automatically generated, manual changes will be lost.
|
||||
#define BUILD_VERSION_STR "3.0.243.1"
|
||||
#define BUILD_VERSION 3,0,243,1
|
||||
#define BUILD_VERSION_STR "3.0.247.1"
|
||||
#define BUILD_VERSION 3,0,247,1
|
||||
|
||||
#ifndef RESOURCE_COMPILER_INVOKED
|
||||
#include <stdint.h>
|
||||
|
|
@ -24,7 +24,7 @@ namespace ARIASDK_NS_BEGIN {
|
|||
uint64_t const Version =
|
||||
((uint64_t)3 << 48) |
|
||||
((uint64_t)0 << 32) |
|
||||
((uint64_t)243 << 16) |
|
||||
((uint64_t)247 << 16) |
|
||||
((uint64_t)1);
|
||||
|
||||
// TODO: [MG] - move declaration of ARIA_SDK_UNUSED to separate include file
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ class MockIOfflineStorage : public ARIASDK_NS::IOfflineStorage {
|
|||
MOCK_METHOD4(ReleaseRecords, void(std::vector<ARIASDK_NS::StorageRecordId> const &, bool, ARIASDK_NS::HttpHeaders, bool&));
|
||||
MOCK_METHOD2(StoreSetting, bool(std::string const &, std::string const &));
|
||||
MOCK_METHOD1(GetSetting, std::string(std::string const &));
|
||||
MOCK_METHOD0(GetSize, unsigned());
|
||||
MOCK_METHOD0(GetSize, size_t());
|
||||
MOCK_METHOD3(GetRecords, std::vector<ARIASDK_NS::StorageRecord>*(bool, ARIASDK_NS::EventLatency, unsigned));
|
||||
MOCK_METHOD0(ResizeDb, bool());
|
||||
};
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче