microsoft
/
cpp_client_telemetry
зеркало из https://github.com/microsoft/cpp_client_telemetry.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

GitHub clean-up drafts

This commit is contained in:
Max Golovanov 2019-03-28 16:40:31 -07:00
Родитель 1ad6a0233d
Коммит 3ef0bd8ca1
621 изменённых файлов: 5138 добавлений и 7856 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

130
.gitignore поставляемый
Просмотреть файл

@ -1,109 +1,61 @@
# Build artifacts
.buildtools
Debug/
Release/
*.VC.db
# Test artifacts
offlinestorage.db*
bondlite/external/bond/
bondlite/external/rapidjson/
bondlite/generated/bond/
bondlite/generated/bond-aria/
dev_buildtools/
ivy.dependency.report/
skype-ant/
staging.d/
sysroot/
skype-ant.zip
Debug/
# Ignore auto-generated Version.hpp
lib/include/public/Version.hpp
lib/jni/gen/
# Eclipse
*.ipch
*.opendb
*.suo
*.user
.buildtools
.cproject
.project
.settings
# Visual Studio files
*.suo
*.opendb
# Zlib generated files
zlib/contrib/masmx86/*.lst
zlib/contrib/masmx64/*.lst
/.metadata/
# UWP generated files
Solutions/afdclient-cpp/Generated\ Files/*
Solutions/ecsclient-cpp/Generated\ Files/*
/Solutions/AriaSDK.VC.VC.opendb
# Visual Studio user files
*.user
# Build artifacts
CMakeCache.txt
3.5.1
CMakeFiles
/Default/
/Makefile
/Sample/Debug/
/Sample/Release/
/Sample/x64/
/Solutions/.vs/
/Solutions/Testing/Temporary
/Solutions/out/
/cmake_install.cmake
/dist/
/docs/out
/examples/.vs/samples/v15/Server/sqlite3
/lib/Makefile
/lib/cmake_install.cmake
/lib/include/Makefile
/lib/include/cmake_install.cmake
/lib/libaria.a
/lib/libmat.a
/linktest/out/*
/tests/curltests/out/*
/out/
/tests/curltests/HttpClient_Curl.hpp
/examples/HelloAria/out/*
linktest/linktest
# Ignore pack configs
/tests/curltests/out/*
/tests/ecs/node_modules
3.5.1
CMakeCache.txt
CMakeFiles
CPackConfig.cmake
CPackSourceConfig.cmake
# Ignore out dir
/Solutions/out/
/out/
#Remove generated files
Generated Files
/Sample/Release/*
/Sample/Debug/*
/Sample/x64/*
# zlib build artifacts
zlib/contrib/**/*.obj
Debug/
Generated\ Files
Release/
Solutions/afdclient-cpp/Generated\ Files/*
Solutions/ecsclient-cpp/Generated\ Files/*
Version.hpp
bondlite/external/bond/
bondlite/generated/bond/
lib/include/public/Version.hpp
lib/jni/gen/
linktest/Makefile
linktest/cmake_install.cmake
linktest/linktest
offlinestorage.db*
sqlite-autoconf*
wrappers/go/example
wrappers/go/offlinestorage.*
zlib/contrib/**/*.obj
zlib/contrib/masmx64/*.lst
zlib/contrib/masmx86/*.lst
zlib/contrib/vstudio/vc14/ARM/
zlib/contrib/vstudio/vc14/Release/
zlib/contrib/vstudio/vc14/ReleaseWithoutAsm/
zlib/contrib/vstudio/vc14/x64/
# Ignore temp files created by Linux build / tests
linktest/Makefile
linktest/cmake_install.cmake
# Ignore temp files created by GoLang projection wrapper
wrappers/go/example
wrappers/go/offlinestorage.db
wrappers/go/offlinestorage.db-shm
wrappers/go/offlinestorage.db-wal
wrappers/go/offlinestorage.db.session64
/Solutions/AriaSDK.VC.db
/Solutions/.vs/AriaSDK/v15
/tests/ecs/node_modules
*.ipch
/Solutions/Testing/Temporary
/Default/
/dist/
/docs/out
Version.hpp
sqlite-autoconf*

10
CHANGELOG.md
Просмотреть файл

@ -10,6 +10,16 @@
- MinGW (experimental, source only)
---
## Version 3.2.87.1 (03/29/2019)
### Design Changes
Code refactor:
- use new namespace alias MAT (Microsoft Applications Telemetry)
- move private proprietary extension modules to /lib/modules
- move private scripts and legacy code to /private
- unify PAL for Win32 and CPP11 into one cross-platform PAL
## Version 3.1.18.1 (01/18/2019)

22
CMakeLists.txt
Просмотреть файл

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.1.0)
project(AriaSDK)
project(MSTelemetry)
set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
@ -54,7 +54,7 @@ set(PAL_IMPLEMENTATION ${DEFAULT_PAL_IMPLEMENTATION})
message(STATUS "-- PAL implementation: ${PAL_IMPLEMENTATION}")
string(TOUPPER ${PAL_IMPLEMENTATION} PAL_IMPLEMENTATION_UPPER)
add_definitions(-DARIASDK_PAL_${PAL_IMPLEMENTATION_UPPER}=1)
add_definitions(-DMATSDK_PAL_${PAL_IMPLEMENTATION_UPPER}=1)
option(GCC5_CXX11_ABI_WORKAROUND "Workaround: Use legacy C++11 ABI (for GCC 5 compatibility)" OFF)
if(GCC5_CXX11_ABI_WORKAROUND)
@ -70,25 +70,25 @@ endif()
################################################################################################
set(SDK_VERSION_PREFIX "EVT")
add_definitions("-DARIASDK_VERSION_PREFIX=\"${SDK_VERSION_PREFIX}\"")
add_definitions("-DMATSDK_VERSION_PREFIX=\"${SDK_VERSION_PREFIX}\"")
set(ARIASDK_API_VERSION "3.1")
set(MATSDK_API_VERSION "3.1")
string(TIMESTAMP DAYNUMBER "%j")
string(REGEX REPLACE "^00" "" DAYNUMBER ${DAYNUMBER})
string(REGEX REPLACE "^0" "" DAYNUMBER ${DAYNUMBER})
if(DEFINED BUILD_VERSION AND NOT BUILD_VERSION STREQUAL "0.0.0.0")
message(STATUS "Using externally set build version: ${BUILD_VERSION}")
string(REPLACE "." "\\." ARIASDK_API_VERSION_ESCAPED ${ARIASDK_API_VERSION})
if(NOT BUILD_VERSION MATCHES "^${ARIASDK_API_VERSION_ESCAPED}\\.")
message(WARNING "BUILD_VERSION (${BUILD_VERSION}) does not start with the current API version prefix (${ARIASDK_API_VERSION}).")
string(REPLACE "." "\\." MATSDK_API_VERSION_ESCAPED ${MATSDK_API_VERSION})
if(NOT BUILD_VERSION MATCHES "^${MATSDK_API_VERSION_ESCAPED}\\.")
message(WARNING "BUILD_VERSION (${BUILD_VERSION}) does not start with the current API version prefix (${MATSDK_API_VERSION}).")
endif()
set(ARIASDK_BUILD_VERSION ${BUILD_VERSION})
set(MATSDK_BUILD_VERSION ${BUILD_VERSION})
else()
set(ARIASDK_BUILD_VERSION ${ARIASDK_API_VERSION}.${DAYNUMBER}.0)
set(MATSDK_BUILD_VERSION ${MATSDK_API_VERSION}.${DAYNUMBER}.0)
endif()
message(STATUS "-- SDK version: ${SDK_VERSION_PREFIX}-${ARIASDK_BUILD_VERSION}")
message(STATUS "-- SDK version: ${SDK_VERSION_PREFIX}-${MATSDK_BUILD_VERSION}")
################################################################################################
# HTTP stack section
@ -173,7 +173,7 @@ if (BUILD_PACKAGE)
endif()
if (${CMAKE_PACKAGE_TYPE} STREQUAL "tgz")
# TODO: [MG] - fix path... should we simply use /usr/local/lib without CPU?
# TODO: [MG] - Windows path is not ideal -- C:/Program Files (x86)/AriaSDK/* - what should we use instead?
# TODO: [MG] - Windows path is not ideal -- C:/Program Files (x86)/MSTelemetry/* - what should we use instead?
include(tools/MakeTgz.cmake)
endif()
endif()

36
Solutions/Clienttelemetry/Clienttelemetry.vcxitems
Просмотреть файл

@ -43,8 +43,9 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\offline\StorageObserver.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\packager\BondSplicer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\packager\Packager.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\DebugTrace.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\InformationProviderImpl.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\PAL_Win32.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\PAL.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\WorkerThread.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\desktop\WindowsEnvironmentInfo.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\stats\MetaStats.cpp" />
@ -52,7 +53,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\system\EventProperties.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\system\EventProperty.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\system\TelemetrySystem.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\system\UtcTelemetrySystem.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\tpm\DeviceStateHandler.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\tpm\TransmissionPolicyManager.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\tpm\TransmitProfiles.cpp" />
@ -69,11 +69,18 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\api\LogManagerImpl.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\backoff\Backoff_ExponentialWithJitter.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\backoff\IBackoff.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\All.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\BondSerializer.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\Common.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\CompactBinaryProtocolReader.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\CompactBinaryProtocolWriter.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\AriaProtocol_readers.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\AriaProtocol_types.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\AriaProtocol_writers.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\BondConstTypes.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_readers.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_types.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_writers.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\compression\HttpDeflateCompression.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\config\RuntimeConfig_Default.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\decorators\BaseDecorator.hpp" />
@ -87,14 +94,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\http\HttpClientManager.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\http\HttpRequestEncoder.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\http\HttpResponseDecoder.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\IDeviceInformation.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\IInformationProvider.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\INetworkInformation.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\IOfflineStorage.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\IPropertyChangedCallback.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\ISystemInformation.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\json.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\oacr.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\config-compact-dll.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\config-compact-exp.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\config-compact-noutc.h" />
@ -103,7 +102,16 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\config-ikeys.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\config-net40.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\config.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\aria.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IBandwidthController.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IDeviceInformation.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IInformationProvider.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\INetworkInformation.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IOfflineStorage.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\json.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CommonFields.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\ctmacros.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CorrelationVector.hpp" />
@ -143,13 +151,13 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\packager\BondSplicer.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\packager\DataPackage.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\packager\Packager.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\DebugTrace.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\DeviceInformationImpl.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\InformationProviderImpl.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\NetworkInformationImpl.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\PAL.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\PAL_Win32.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\SystemInformationImpl.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\UtcHelpers.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\typename.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\WorkerThread.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\desktop\WindowsEnvironmentInfo.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\stats\MetaStats.hpp" />
@ -161,7 +169,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\system\Route.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\system\TelemetrySystem.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\system\TelemetrySystemBase.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\system\UtcTelemetrySystem.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\tpm\DeviceStateHandler.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\tpm\TransmissionPolicyManager.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\FileUtils.hpp" />
@ -169,6 +176,7 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\Utils.hpp" />
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\README" />
<None Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp.template" />
</ItemGroup>
</Project>

123
Solutions/Clienttelemetry/Clienttelemetry.vcxitems.filters
Просмотреть файл

@ -40,7 +40,7 @@
<Filter Include="include">
<UniqueIdentifier>{a7bd03bb-b918-4c22-b5c8-8ae8357de1a4}</UniqueIdentifier>
</Filter>
<Filter Include="include\aria">
<Filter Include="include\mat">
<UniqueIdentifier>{e1dbfa07-6cc7-4f31-b0b3-f594e2c6f25b}</UniqueIdentifier>
</Filter>
<Filter Include="offline">
@ -58,7 +58,7 @@
<Filter Include="include\public">
<UniqueIdentifier>{745547c2-8b4f-47bf-bb27-aa23eeb6303f}</UniqueIdentifier>
</Filter>
<Filter Include="include\aria">
<Filter Include="include\mat">
<UniqueIdentifier>{80621d23-c9e9-41fe-9d54-e930b5f04a15}</UniqueIdentifier>
</Filter>
<Filter Include="filter">
@ -67,6 +67,9 @@
<Filter Include="include\mat">
<UniqueIdentifier>{f0264a27-35fe-4529-946f-9583e4624255}</UniqueIdentifier>
</Filter>
<Filter Include="pal\desktop">
<UniqueIdentifier>{0741500d-ddf5-493d-bbad-ce8905ee0c91}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\stats\MetaStats.cpp">
@ -132,9 +135,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\packager\Packager.cpp">
<Filter>packager</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\PAL_Win32.cpp">
<Filter>pal</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\InformationProviderImpl.cpp">
<Filter>pal</Filter>
</ClCompile>
@ -144,9 +144,6 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\tpm\DeviceStateHandler.cpp">
<Filter>tpm</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\system\UtcTelemetrySystem.cpp">
<Filter>system</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\callbacks\DebugSource.cpp">
<Filter>callbacks</Filter>
</ClCompile>
@ -195,10 +192,18 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\offline\MemoryStorage.cpp">
<Filter>offline</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\desktop\WindowsEnvironmentInfo.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\utils\FileUtils.cpp">
<Filter>utils</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\DebugTrace.cpp">
<Filter>pal</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\PAL.cpp">
<Filter>pal</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\pal\desktop\WindowsEnvironmentInfo.cpp">
<Filter>pal\desktop</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\stats\MetaStats.hpp">
@ -300,9 +305,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\PAL.hpp">
<Filter>pal</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\PAL_Win32.hpp">
<Filter>pal</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\SystemInformationImpl.hpp">
<Filter>pal</Filter>
</ClInclude>
@ -330,12 +332,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\system\ITelemetrySystem.hpp">
<Filter>system</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\system\UtcTelemetrySystem.hpp">
<Filter>system</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\UtcHelpers.hpp">
<Filter>pal</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\StringUtils.hpp">
<Filter>utils</Filter>
</ClInclude>
@ -405,30 +401,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\api\AuthTokensController.hpp">
<Filter>api</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\IDeviceInformation.hpp">
<Filter>include\aria</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\IInformationProvider.hpp">
<Filter>include\aria</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\INetworkInformation.hpp">
<Filter>include\aria</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\IOfflineStorage.hpp">
<Filter>include\aria</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\IPropertyChangedCallback.hpp">
<Filter>include\aria</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\ISystemInformation.hpp">
<Filter>include\aria</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\json.hpp">
<Filter>include\aria</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\aria\oacr.h">
<Filter>include\aria</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\LogConfiguration.hpp">
<Filter>include\public</Filter>
</ClInclude>
@ -471,9 +443,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\NullObjects.hpp">
<Filter>include\public</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\aria.h">
<Filter>include\public</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\LogManagerProvider.hpp">
<Filter>include\public</Filter>
</ClInclude>
@ -486,7 +455,6 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\CAPIClient.hpp">
<Filter>include\public</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\desktop\WindowsEnvironmentInfo.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\utils\FileUtils.hpp">
<Filter>utils</Filter>
</ClInclude>
@ -529,10 +497,73 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\config-net40.h">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\DebugTrace.hpp">
<Filter>pal</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IBandwidthController.hpp">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IDeviceInformation.hpp">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IInformationProvider.hpp">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\INetworkInformation.hpp">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IOfflineStorage.hpp">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\IPropertyChangedCallback.hpp">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\ISystemInformation.hpp">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\json.hpp">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\oacr.h">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\TransmitProfiles.hpp">
<Filter>include\mat</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\desktop\WindowsEnvironmentInfo.h">
<Filter>pal\desktop</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\pal\typename.hpp">
<Filter>pal</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\All.hpp">
<Filter>bond</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\Common.hpp">
<Filter>bond</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\CompactBinaryProtocolReader.hpp">
<Filter>bond</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\CompactBinaryProtocolWriter.hpp">
<Filter>bond</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_readers.hpp">
<Filter>bond\generated</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_types.hpp">
<Filter>bond\generated</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\bond\generated\CsProtocol_writers.hpp">
<Filter>bond\generated</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\..\lib\include\public\Version.hpp.template">
<Filter>include\public</Filter>
</None>
<None Include="$(MSBuildThisFileDirectory)..\..\lib\include\mat\README">
<Filter>include\mat</Filter>
</None>
</ItemGroup>
</Project>

152
Solutions/AriaSDK.sln → Solutions/MSTelemetrySDK.sln
Просмотреть файл

@ -52,7 +52,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "include", "include", "{5538
..\lib\include\public\ILogConfiguration.hpp = ..\lib\include\public\ILogConfiguration.hpp
..\lib\include\public\ILogger.hpp = ..\lib\include\public\ILogger.hpp
..\lib\include\public\ILogManager.hpp = ..\lib\include\public\ILogManager.hpp
..\lib\include\public\IRuntimeConfig.hpp = ..\lib\include\public\IRuntimeConfig.hpp
..\lib\include\public\ISemanticContext.hpp = ..\lib\include\public\ISemanticContext.hpp
..\lib\include\public\LogManager.hpp = ..\lib\include\public\LogManager.hpp
..\lib\include\public\LogSessionData.hpp = ..\lib\include\public\LogSessionData.hpp
@ -64,25 +63,39 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32-lib", "win32-lib\win3
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{A176E75D-5470-4D6E-A409-BDC950BE3AC4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloAria", "..\examples\HelloAria\HelloAria.vcxproj", "{86AC752C-5687-4377-841E-943D9BEEF360}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "..\tests\unittests\UnitTests.vcxproj", "{434C594F-CDE0-3690-AC0A-9ED854B74092}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HelloAriaCS", "..\examples\HelloAriaCS\HelloAriaCS.csproj", "{65AFA0E2-F9A2-4309-87E7-E419D59583C1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FuncTests", "..\tests\functests\FuncTests.vcxproj", "{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win10-lib", "win10-lib\win10-lib.vcxproj", "{7A75748D-5D6B-48A5-83CB-F5F439133D59}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tracing-api", "..\lib\tracing\api\tracing-api.vcxitems", "{4DA18A2A-8752-45EA-A2F1-212A959619F4}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HelloAriaMini", "..\examples\HelloAriaMini\HelloAriaMini.vcxproj", "{86AC752C-5687-4377-841E-943D9BEEF361}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32-mini-dll", "win32-mini-dll\win32-mini-dll.vcxproj", "{216A8E97-21F7-4BEF-9E52-7F772C177C33}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "win32-mini-lib", "win32-mini-lib\win32-mini-lib.vcxproj", "{1DC6B38A-B390-34CE-907F-4958807A3D43}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exp", "exp\exp.vcxitems", "{2BFAFE9A-45B0-4C02-841E-03E47FD2E340}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "exp", "..\lib\modules\exp\exp.vcxitems", "{2BFAFE9A-45B0-4C02-841E-03E47FD2E340}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{23F546DE-29F8-4F18-A378-42BCFE1781C0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utc", "utc", "{3AEBFFA7-A058-4D1B-AAD0-DF4544E239C4}"
ProjectSection(SolutionItems) = preProject
..\lib\modules\utc\MicrosoftTelemetry.h = ..\lib\modules\utc\MicrosoftTelemetry.h
..\lib\modules\utc\traceloggingdynamic.h = ..\lib\modules\utc\traceloggingdynamic.h
..\lib\modules\utc\utctelemetrysystem.cpp = ..\lib\modules\utc\utctelemetrysystem.cpp
..\lib\modules\utc\UtcTelemetrySystem.hpp = ..\lib\modules\utc\UtcTelemetrySystem.hpp
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "desktop", "desktop", "{9A8399F2-EB6D-4E63-9158-07A59C4AD6C9}"
ProjectSection(SolutionItems) = preProject
..\lib\modules\utc\desktop\UtcHelpers.cpp = ..\lib\modules\utc\desktop\UtcHelpers.cpp
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "universal", "universal", "{66BDFD60-DE23-4F25-82DB-3F9777D43714}"
ProjectSection(SolutionItems) = preProject
..\lib\modules\utc\universal\UtcHelpers.cpp = ..\lib\modules\utc\universal\UtcHelpers.cpp
EndProjectSection
EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
@ -94,21 +107,20 @@ Global
Clienttelemetry\Clienttelemetry.vcxitems*{1dc6b38a-b390-34ce-907f-4958807a3d43}*SharedItemsImports = 4
..\lib\pal\desktop\desktop.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
exp\exp.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c32}*SharedItemsImports = 4
..\lib\pal\desktop\desktop.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c33}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{216a8e97-21f7-4bef-9e52-7f772c177c33}*SharedItemsImports = 4
exp\exp.vcxitems*{2bfafe9a-45b0-4c02-841e-03e47fd2e340}*SharedItemsImports = 9
..\lib\modules\exp\exp.vcxitems*{2bfafe9a-45b0-4c02-841e-03e47fd2e340}*SharedItemsImports = 9
..\lib\pal\desktop\desktop.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{434c594f-cde0-3690-ac0a-9ed854b74092}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9
..\lib\modules\exp\exp.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
..\lib\pal\universal\universal.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
..\lib\shared\Shared.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
exp\exp.vcxitems*{49077dbf-e363-4d2d-8334-636569a771b6}*SharedItemsImports = 4
..\lib\tracing\api\tracing-api.vcxitems*{4da18a2a-8752-45ea-a2f1-212a959619f4}*SharedItemsImports = 9
..\lib\modules\exp\exp.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
..\lib\pal\universal\universal.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
exp\exp.vcxitems*{57a81ed9-5603-471f-afee-9656da74178d}*SharedItemsImports = 4
..\lib\pal\universal\universal.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
Clienttelemetry\Clienttelemetry.vcxitems*{7a75748d-5d6b-48a5-83cb-f5f439133d59}*SharedItemsImports = 4
..\lib\shared\Shared.vcxitems*{dc91621e-a203-42df-8e03-3a23dd0602b1}*SharedItemsImports = 4
@ -510,43 +522,6 @@ Global
{1DC6B38A-B390-34CE-907F-4958807A3D42}.Release|Win32.Build.0 = Release|Win32
{1DC6B38A-B390-34CE-907F-4958807A3D42}.Release|x64.ActiveCfg = Release|x64
{1DC6B38A-B390-34CE-907F-4958807A3D42}.Release|x64.Build.0 = Release|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.static|ARM.ActiveCfg = Debug.static|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.static|ARM64.ActiveCfg = Debug.static|ARM64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.static|Win32.ActiveCfg = Debug.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.static|Win32.Build.0 = Debug.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.static|x64.ActiveCfg = Debug.static|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.static|x64.Build.0 = Debug.static|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.vs2015.MT-sqlite|ARM.ActiveCfg = Release|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.vs2015.MT-sqlite|ARM64.ActiveCfg = Debug.vs2015.MT-sqlite|ARM64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.vs2015.MT-sqlite|ARM64.Build.0 = Debug.vs2015.MT-sqlite|ARM64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.vs2015.MT-sqlite|Win32.ActiveCfg = Debug|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug.vs2015.MT-sqlite|x64.ActiveCfg = Debug|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug|ARM.ActiveCfg = Debug|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug|ARM64.ActiveCfg = Debug|ARM64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug|Win32.ActiveCfg = Debug|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug|Win32.Build.0 = Debug|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug|x64.ActiveCfg = Debug|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Debug|x64.Build.0 = Debug|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.static|ARM.ActiveCfg = Release.static|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.static|ARM64.ActiveCfg = Release.static|ARM64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.static|ARM64.Build.0 = Release.static|ARM64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.static|Win32.ActiveCfg = Release.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.static|Win32.Build.0 = Release.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.static|x64.ActiveCfg = Release.static|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.static|x64.Build.0 = Release.static|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.vs2015.MT-sqlite|ARM.ActiveCfg = Release|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.vs2015.MT-sqlite|ARM64.ActiveCfg = Release.vs2015.MT-sqlite|ARM64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.vs2015.MT-sqlite|ARM64.Build.0 = Release.vs2015.MT-sqlite|ARM64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.vs2015.MT-sqlite|Win32.ActiveCfg = Release.vs2015.MT-sqlite|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.vs2015.MT-sqlite|Win32.Build.0 = Release.vs2015.MT-sqlite|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.vs2015.MT-sqlite|x64.ActiveCfg = Release.vs2015.MT-sqlite|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release.vs2015.MT-sqlite|x64.Build.0 = Release.vs2015.MT-sqlite|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release|ARM.ActiveCfg = Release|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release|ARM64.ActiveCfg = Release|ARM64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release|Win32.ActiveCfg = Release|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Release|Win32.Build.0 = Release|Win32
{86AC752C-5687-4377-841E-943D9BEEF360}.Release|x64.ActiveCfg = Release|x64
{86AC752C-5687-4377-841E-943D9BEEF360}.Release|x64.Build.0 = Release|x64
{434C594F-CDE0-3690-AC0A-9ED854B74092}.Debug.static|ARM.ActiveCfg = Debug|x64
{434C594F-CDE0-3690-AC0A-9ED854B74092}.Debug.static|ARM64.ActiveCfg = Debug|ARM64
{434C594F-CDE0-3690-AC0A-9ED854B74092}.Debug.static|ARM64.Build.0 = Debug|ARM64
@ -580,36 +555,6 @@ Global
{434C594F-CDE0-3690-AC0A-9ED854B74092}.Release|Win32.Build.0 = Release|Win32
{434C594F-CDE0-3690-AC0A-9ED854B74092}.Release|x64.ActiveCfg = Release|x64
{434C594F-CDE0-3690-AC0A-9ED854B74092}.Release|x64.Build.0 = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug.static|ARM.ActiveCfg = Debug|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug.static|ARM64.ActiveCfg = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug.static|Win32.ActiveCfg = Debug|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug.static|x64.ActiveCfg = Debug|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug.static|x64.Build.0 = Debug|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug.vs2015.MT-sqlite|ARM.ActiveCfg = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug.vs2015.MT-sqlite|ARM64.ActiveCfg = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug.vs2015.MT-sqlite|Win32.ActiveCfg = Debug|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug.vs2015.MT-sqlite|x64.ActiveCfg = Debug|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug|ARM.ActiveCfg = Debug|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug|ARM64.ActiveCfg = Debug|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug|Win32.ActiveCfg = Debug|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug|Win32.Build.0 = Debug|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug|x64.ActiveCfg = Debug|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Debug|x64.Build.0 = Debug|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release.static|ARM.ActiveCfg = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release.static|ARM64.ActiveCfg = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release.static|Win32.ActiveCfg = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release.static|x64.ActiveCfg = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release.static|x64.Build.0 = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release.vs2015.MT-sqlite|ARM.ActiveCfg = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release.vs2015.MT-sqlite|ARM64.ActiveCfg = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release.vs2015.MT-sqlite|Win32.ActiveCfg = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release.vs2015.MT-sqlite|x64.ActiveCfg = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release|ARM.ActiveCfg = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release|ARM64.ActiveCfg = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release|Win32.ActiveCfg = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release|Win32.Build.0 = Release|x86
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release|x64.ActiveCfg = Release|x64
{65AFA0E2-F9A2-4309-87E7-E419D59583C1}.Release|x64.Build.0 = Release|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.static|ARM.ActiveCfg = Debug|x64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.static|ARM64.ActiveCfg = Debug|ARM64
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39}.Debug.static|ARM64.Build.0 = Debug|ARM64
@ -678,48 +623,6 @@ Global
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|Win32.Build.0 = Release|Win32
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|x64.ActiveCfg = Release|x64
{7A75748D-5D6B-48A5-83CB-F5F439133D59}.Release|x64.Build.0 = Release|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.static|ARM.ActiveCfg = Debug.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.static|ARM64.ActiveCfg = Debug.static|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.static|ARM64.Build.0 = Debug.static|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.static|Win32.ActiveCfg = Debug.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.static|Win32.Build.0 = Debug.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.static|x64.ActiveCfg = Debug.static|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.static|x64.Build.0 = Debug.static|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.vs2015.MT-sqlite|ARM.ActiveCfg = Debug.vs2015.MT-sqlite|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.vs2015.MT-sqlite|ARM64.ActiveCfg = Debug.vs2015.MT-sqlite|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.vs2015.MT-sqlite|ARM64.Build.0 = Debug.vs2015.MT-sqlite|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.vs2015.MT-sqlite|Win32.ActiveCfg = Debug.vs2015.MT-sqlite|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.vs2015.MT-sqlite|Win32.Build.0 = Debug.vs2015.MT-sqlite|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.vs2015.MT-sqlite|x64.ActiveCfg = Debug.vs2015.MT-sqlite|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug.vs2015.MT-sqlite|x64.Build.0 = Debug.vs2015.MT-sqlite|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug|ARM.ActiveCfg = Debug|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug|ARM64.ActiveCfg = Debug|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug|ARM64.Build.0 = Debug|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug|Win32.ActiveCfg = Debug|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug|Win32.Build.0 = Debug|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug|x64.ActiveCfg = Debug|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Debug|x64.Build.0 = Debug|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.static|ARM.ActiveCfg = Release.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.static|ARM64.ActiveCfg = Release.static|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.static|ARM64.Build.0 = Release.static|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.static|Win32.ActiveCfg = Release.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.static|Win32.Build.0 = Release.static|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.static|x64.ActiveCfg = Release.static|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.static|x64.Build.0 = Release.static|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.vs2015.MT-sqlite|ARM.ActiveCfg = Release.vs2015.MT-sqlite|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.vs2015.MT-sqlite|ARM64.ActiveCfg = Release.vs2015.MT-sqlite|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.vs2015.MT-sqlite|ARM64.Build.0 = Release.vs2015.MT-sqlite|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.vs2015.MT-sqlite|Win32.ActiveCfg = Release.vs2015.MT-sqlite|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.vs2015.MT-sqlite|Win32.Build.0 = Release.vs2015.MT-sqlite|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.vs2015.MT-sqlite|x64.ActiveCfg = Release.vs2015.MT-sqlite|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release.vs2015.MT-sqlite|x64.Build.0 = Release.vs2015.MT-sqlite|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release|ARM.ActiveCfg = Release|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Release|ARM64.ActiveCfg = Release|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release|ARM64.Build.0 = Release|ARM64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release|Win32.ActiveCfg = Release|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Release|Win32.Build.0 = Release|Win32
{86AC752C-5687-4377-841E-943D9BEEF361}.Release|x64.ActiveCfg = Release|x64
{86AC752C-5687-4377-841E-943D9BEEF361}.Release|x64.Build.0 = Release|x64
{216A8E97-21F7-4BEF-9E52-7F772C177C33}.Debug.static|ARM.ActiveCfg = Release|x64
{216A8E97-21F7-4BEF-9E52-7F772C177C33}.Debug.static|ARM.Build.0 = Release|x64
{216A8E97-21F7-4BEF-9E52-7F772C177C33}.Debug.static|ARM64.ActiveCfg = Debug|ARM64
@ -820,11 +723,12 @@ Global
{34681F0D-CE45-415D-B5F2-5C662DFE3BD5} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
{C8F6C172-56F2-4E76-B5FA-C3B423B31BE7} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
{EF859326-2A11-481C-AE8C-03D754F1C412} = {34B3E59D-E740-4C23-ACEE-E94C80E83A18}
{86AC752C-5687-4377-841E-943D9BEEF360} = {250EFB82-2F0E-4781-94BB-8313201ABDF0}
{434C594F-CDE0-3690-AC0A-9ED854B74092} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
{65AFA0E2-F9A2-4309-87E7-E419D59583C1} = {250EFB82-2F0E-4781-94BB-8313201ABDF0}
{FE79FB3A-B3EF-38DF-B7A4-11277DB72B39} = {A176E75D-5470-4D6E-A409-BDC950BE3AC4}
{86AC752C-5687-4377-841E-943D9BEEF361} = {250EFB82-2F0E-4781-94BB-8313201ABDF0}
{2BFAFE9A-45B0-4C02-841E-03E47FD2E340} = {23F546DE-29F8-4F18-A378-42BCFE1781C0}
{3AEBFFA7-A058-4D1B-AAD0-DF4544E239C4} = {23F546DE-29F8-4F18-A378-42BCFE1781C0}
{9A8399F2-EB6D-4E63-9158-07A59C4AD6C9} = {3AEBFFA7-A058-4D1B-AAD0-DF4544E239C4}
{66BDFD60-DE23-4F25-82DB-3F9777D43714} = {3AEBFFA7-A058-4D1B-AAD0-DF4544E239C4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {7EE8585B-C10F-4DAC-BDAF-3726EDF8FCD7}

Двоичные данные
Solutions/VersionInfo.rc
Просмотреть файл

Двоичный файл не отображается.

13
Solutions/afdclient-cpp/Generated Files/XamlBindingInfo.g.hpp
Просмотреть файл

@ -1,13 +0,0 @@

//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
#include "pch.h"

4
Solutions/ecsclient-cpp/ecsclient-cpp.vcxproj.user
Просмотреть файл

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>

44
Solutions/exp/exp.vcxitems
Просмотреть файл

@ -1,44 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<ItemsProjectGuid>{2bfafe9a-45b0-4c02-841e-03e47fd2e340}</ItemsProjectGuid>
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ProjectCapability Include="SourceItemsFromImports" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClient.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClientConfig.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClientUtils.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDConfigCache.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClient.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClientConfig.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClientUtils.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSConfigCache.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\EXPCommonClient.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\FifoFileStorage.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\IDataStorage.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\JsonHelper.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClient.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClientUtils.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDConfigCache.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClient.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClientUtils.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSConfigCache.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\EXPCommonClient.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\FifoFileStorage.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\JsonHelper.cpp" />
</ItemGroup>
<ItemGroup>
<Text Include="$(MSBuildThisFileDirectory)..\..\lib\exp\README" />
</ItemGroup>
</Project>

67
Solutions/exp/exp.vcxitems.filters
Просмотреть файл

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\EXPCommonClient.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\JsonHelper.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClient.cpp">
<Filter>afd</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClientUtils.cpp">
<Filter>afd</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDConfigCache.cpp">
<Filter>afd</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClient.cpp">
<Filter>ecs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClientUtils.cpp">
<Filter>ecs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSConfigCache.cpp">
<Filter>ecs</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\lib\exp\FifoFileStorage.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\EXPCommonClient.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\JsonHelper.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClient.hpp">
<Filter>afd</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClientConfig.hpp">
<Filter>afd</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDClientUtils.hpp">
<Filter>afd</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\afd\afdclient\AFDConfigCache.hpp">
<Filter>afd</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClient.hpp">
<Filter>ecs</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClientConfig.hpp">
<Filter>ecs</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSClientUtils.hpp">
<Filter>ecs</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\ecs\ecsclient\ECSConfigCache.hpp">
<Filter>ecs</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\FifoFileStorage.hpp" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\lib\exp\IDataStorage.hpp" />
</ItemGroup>
<ItemGroup>
<Filter Include="afd">
<UniqueIdentifier>{e2512b83-08f0-42e3-81f1-765489526892}</UniqueIdentifier>
</Filter>
<Filter Include="ecs">
<UniqueIdentifier>{a2dce1c3-c4b8-488d-ba6c-0f23f7bf436f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="$(MSBuildThisFileDirectory)..\..\lib\exp\README" />
</ItemGroup>
</Project>

40
Solutions/lib/aria.vcxproj
Просмотреть файл

@ -72,7 +72,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Debug/</AssemblerListingLocation>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<CompileAs>CompileAsCpp</CompileAs>
@ -84,16 +84,16 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>ARIASDK_STATIC_LIB;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;CMAKE_INTDIR="Debug";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>MATSDK_STATIC_LIB;WIN32;_WINDOWS;_DEBUG;MATSDK_PAL_WIN32=1;CMAKE_INTDIR="Debug";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;CMAKE_INTDIR=\"Debug\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;MATSDK_PAL_WIN32=1;CMAKE_INTDIR=\"Debug\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -106,7 +106,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Release/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
@ -116,18 +116,18 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>ARIASDK_STATIC_LIB;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;CMAKE_INTDIR="Release";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>MATSDK_STATIC_LIB;WIN32;_WINDOWS;NDEBUG;MATSDK_PAL_WIN32=1;CMAKE_INTDIR="Release";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat>
</DebugInformationFormat>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;CMAKE_INTDIR=\"Release\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;MATSDK_PAL_WIN32=1;CMAKE_INTDIR=\"Release\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -140,7 +140,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Debug/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<ExceptionHandling>Sync</ExceptionHandling>
@ -150,18 +150,18 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>ARIASDK_STATIC_LIB;WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;CMAKE_INTDIR="Debug";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>MATSDK_STATIC_LIB;WIN32;_WINDOWS;_DEBUG;MATSDK_PAL_WIN32=1;CMAKE_INTDIR="Debug";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<DebugInformationFormat>
</DebugInformationFormat>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;ARIASDK_PAL_WIN32=1;CMAKE_INTDIR=\"Debug\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;MATSDK_PAL_WIN32=1;CMAKE_INTDIR=\"Debug\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>
@ -174,7 +174,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AssemblerListingLocation>Release/</AssemblerListingLocation>
<CompileAs>CompileAsCpp</CompileAs>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@ -185,16 +185,16 @@
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<WarningLevel>Level4</WarningLevel>
<PreprocessorDefinitions>ARIASDK_STATIC_LIB;WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;CMAKE_INTDIR="Release";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>MATSDK_STATIC_LIB;WIN32;_WINDOWS;NDEBUG;MATSDK_PAL_WIN32=1;CMAKE_INTDIR="Release";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ObjectFileName>$(IntDir)</ObjectFileName>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;ARIASDK_PAL_WIN32=1;CMAKE_INTDIR=\"Release\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;MATSDK_PAL_WIN32=1;CMAKE_INTDIR=\"Release\";WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Midl>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib\bond\generated;$(ProjectDir)..\..\lib\http;$(ProjectDir)..\..\lib\api;$(ProjectDir)..\..\lib\backoff;$(ProjectDir)..\..\lib\callbacks;$(ProjectDir)..\..\lib\config;$(ProjectDir)..\..\lib\compression;$(ProjectDir)..\..\lib\decorators;$(ProjectDir)..\..\lib\offline;$(ProjectDir)..\..\lib\packager;$(ProjectDir)..\..\lib\pal;$(ProjectDir)..\..\lib\stats;$(ProjectDir)..\..\lib\system;$(ProjectDir)..\..\lib\tpm;$(ProjectDir)..\..\lib\utils;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\lib\bond;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<OutputDirectory>$(ProjectDir)/$(IntDir)</OutputDirectory>
<HeaderFileName>%(Filename).h</HeaderFileName>
<TypeLibraryName>%(Filename).tlb</TypeLibraryName>

4
Solutions/net40/AssemblyInfo.cpp
Просмотреть файл

@ -16,9 +16,9 @@ using namespace System::Security::Permissions;
[assembly:AssemblyDescriptionAttribute(L"Microsoft data file")];
[assembly:AssemblyConfigurationAttribute(L"Retail")];
[assembly:AssemblyCompanyAttribute(L"Microsoft")];
[assembly:AssemblyProductAttribute(L"ARIA SDK for Windows")];
[assembly:AssemblyProductAttribute(L"Microsoft Telemetry SDK for Windows")];
[assembly:AssemblyCopyrightAttribute(L"Copyright (c) 2017")];
[assembly:AssemblyTrademarkAttribute(L"ARIA SDK for Windows")];
[assembly:AssemblyTrademarkAttribute(L"Microsoft Telemetry SDK for Windows")];
[assembly:AssemblyCultureAttribute(L"")];
[assembly:AssemblyKeyFile("Test.snk")];
// [assembly:AssemblyDelaySign(true)];

2
Solutions/net40/dllmain.cpp
Просмотреть файл

@ -18,7 +18,7 @@ HRESULT __stdcall DllCanUnloadNow(void)
}
/// <summary>
/// Lock ARIA DLL in memory until process shutdown
/// Lock Microsoft Telemetry DLL in memory until process shutdown
/// </summary>
void LockInMemory()
{

8
Solutions/net40/net40.vcxproj
Просмотреть файл

@ -113,8 +113,8 @@
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged>true</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
@ -196,8 +196,8 @@
<Optimization Condition="'$(Platform)'=='x64'">Disabled</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib\shared;$(ProjectDir)..\..\lib\shared\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>true</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<AssemblerOutput>All</AssemblerOutput>

8
Solutions/uap-cpp/App.xaml
Просмотреть файл

@ -1,8 +0,0 @@
<Application
x:Class="UAPCPP.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:UAPCPP"
RequestedTheme="Light">
</Application>

219
Solutions/uap-cpp/App.xaml.cpp
Просмотреть файл

@ -1,219 +0,0 @@
//
// App.xaml.cpp
// Implementation of the App class.
//
#include <collection.h>
#include <ppltasks.h>
#include "App.xaml.h"
#include "MainPage.xaml.h"
#include "LogManager.hpp"
using namespace Microsoft::Applications::Telemetry;
using namespace UAPCPP;
using namespace Platform;
using namespace Windows::ApplicationModel;
using namespace Windows::ApplicationModel::Activation;
using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;
using namespace Windows::UI::Xaml;
using namespace Windows::UI::Xaml::Controls;
using namespace Windows::UI::Xaml::Controls::Primitives;
using namespace Windows::UI::Xaml::Data;
using namespace Windows::UI::Xaml::Input;
using namespace Windows::UI::Xaml::Interop;
using namespace Windows::UI::Xaml::Media;
using namespace Windows::UI::Xaml::Navigation;
// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=402347&clcid=0x409
extern "C" void testTraceLogging();
ILogger *logger;
ILogger *logger2;
ISemanticContext *context;
extern "C" void SendTelemetryEvents() {
context->SetAppId("UAPCPP");
logger->LogEvent("Event_Simple");
logger2->LogEvent("Event_Simple");
EventProperties properties("YOUR_EVENT_NAME");
properties.SetPriority(EventPriority_High);
properties.SetProperty("String_Property", "String Value");
AggregatedMetricData metricData("Aggregated Metric 1", 10, 100);
logger->LogAggregatedMetric(metricData, properties);
logger2->LogAggregatedMetric(metricData, properties);
PageActionData pageData("page_view_id", ActionType_Click);
logger->LogPageAction(pageData, properties);
logger2->LogPageAction(pageData, properties);
logger->LogAppLifecycle(AppLifecycleState_Launch, EventProperties(""));
logger2->LogAppLifecycle(AppLifecycleState_Launch, EventProperties(""));
logger->LogSession(SessionState::Session_Started, EventProperties("LogSessionTest"));
logger->LogSession(SessionState::Session_Ended, EventProperties("LogSessionTest"));
logger2->LogSession(SessionState::Session_Started, EventProperties("LogSessionTest"));
logger2->LogSession(SessionState::Session_Ended, EventProperties("LogSessionTest"));
try {
EventProperties properties2("Bad_Event");
properties2.SetProperty("12345", 12345L);
logger->LogEvent(properties2);
}
catch (const std::logic_error& ex) {
OutputDebugStringA("Good stuff: we handled the exception here!\n");
}
}
void App::SendTelemetry() {
SendTelemetryEvents();
}
/// <summary>
/// Initializes the singleton application object. This is the first line of authored code
/// executed, and as such is the logical equivalent of main() or WinMain().
/// </summary>
App::App()
{
InitializeComponent();
Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
Resuming += ref new EventHandler<Platform::Object^>(this, &App::OnResuming);
LogConfiguration configuration;
// configuration.cacheFilePath = "of";
// Windows SDK Test - Prod: Default Ingestion Token.
// Specify this API token in the SDK initialization call to send data for this application.
// Please keep this token secure if it is for production services.
// https://aria.microsoft.com/developer/start-now/using-aria/send-events
// Always enable debug output
configuration.traceLevelMask = 0xFFFFFFFF; // API calls + Global mask for general messages
configuration.minimumTraceLevel = ACTTraceLevel_Trace;
configuration.sdkmode = SdkModeTypes::SdkModeTypes_UTCAriaBackCompat;
// configuration.useWindowsSamplinginUtcMode = true;
#if 1 /* Use INT */
configuration.eventCollectorUri = "https://pipe.int.trafficmanager.net/Collector/3.0/";
logger = LogManager::Initialize("0c21c15bdccc48c99678a748488bb87f-cca6848e-b4aa-48a6-b24a-0170caf27523-7582", configuration); // Windows SDK Test - INT on INT collector
#else
logger = LogManager::Initialize("6d084bbf6a9644ef83f40a77c9e34580-c2d379e0-4408-4325-9b4d-2a7d78131e14-7322", configuration);
#endif
logger2 = LogManager::GetLogger("4c824cfb53154a9b8e709962774ae879-e4db1514-2b8d-42e8-9700-9b9b3880278e-7210", "");
context = LogManager::GetSemanticContext();
// Send some sample events
testTraceLogging();
SendTelemetry();
}
/// <summary>
/// Invoked when the application is launched normally by the end user. Other entry points
/// will be used such as when the application is launched to open a specific file.
/// </summary>
/// <param name="e">Details about the launch request and process.</param>
void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e)
{
#if _DEBUG
// Show graphics profiling information while debugging.
if (IsDebuggerPresent())
{
// Display the current frame rate counters
DebugSettings->EnableFrameRateCounter = true;
}
#endif
auto rootFrame = dynamic_cast<Frame^>(Window::Current->Content);
// Do not repeat app initialization when the Window already has content,
// just ensure that the window is active
if (rootFrame == nullptr)
{
// Create a Frame to act as the navigation context and associate it with
// a SuspensionManager key
rootFrame = ref new Frame();
rootFrame->NavigationFailed += ref new Windows::UI::Xaml::Navigation::NavigationFailedEventHandler(this, &App::OnNavigationFailed);
if (e->PreviousExecutionState == ApplicationExecutionState::Terminated)
{
// TODO: Restore the saved session state only when appropriate, scheduling the
// final launch steps after the restore is complete
}
if (rootFrame->Content == nullptr)
{
// When the navigation stack isn't restored navigate to the first page,
// configuring the new page by passing required information as a navigation
// parameter
rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments);
}
// Place the frame in the current Window
Window::Current->Content = rootFrame;
// Ensure the current window is active
Window::Current->Activate();
}
else
{
if (rootFrame->Content == nullptr)
{
// When the navigation stack isn't restored navigate to the first page,
// configuring the new page by passing required information as a navigation
// parameter
rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments);
}
// Ensure the current window is active
Window::Current->Activate();
}
}
/// <summary>
/// Invoked when application execution is being suspended. Application state is saved
/// without knowing whether the application will be terminated or resumed with the contents
/// of memory still intact.
/// </summary>
/// <param name="sender">The source of the suspend request.</param>
/// <param name="e">Details about the suspend request.</param>
void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
{
(void)sender; // Unused parameter
(void)e; // Unused parameter
OutputDebugStringA("OnSuspending\n");
SendTelemetry();
LogManager::FlushAndTeardown();
}
void App::OnResuming(Platform::Object^ sender, Platform::Object^ e)
{
(void)sender; // Unused parameter
(void)e; // Unused parameter
OutputDebugStringA("OnResuming\n");
SendTelemetry();
}
/// <summary>
/// Invoked when Navigation to a certain page fails
/// </summary>
/// <param name="sender">The Frame which failed navigation</param>
/// <param name="e">Details about the navigation failure</param>
void App::OnNavigationFailed(Platform::Object ^sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^e)
{
throw ref new FailureException("Failed to load Page " + e->SourcePageType.Name);
}

13
Solutions/uap-cpp/MainPage.xaml
Просмотреть файл

@ -1,13 +0,0 @@
<Page
x:Class="UAPCPP.MainPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:UAPCPP"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Button x:Name="button" Content="Button" HorizontalAlignment="Left" Margin="133,245,0,0" VerticalAlignment="Top" Click="button_Click"/>
</Grid>
</Page>

37
Solutions/uap-cpp/MainPage.xaml.cpp
Просмотреть файл

@ -1,37 +0,0 @@
//
// MainPage.xaml.cpp
// Implementation of the MainPage class.
//
#include "MainPage.xaml.h"
#include "TraceLogSample.hpp"
using namespace UAPCPP;
using namespace Platform;
using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;
using namespace Windows::UI::Xaml;
using namespace Windows::UI::Xaml::Controls;
using namespace Windows::UI::Xaml::Controls::Primitives;
using namespace Windows::UI::Xaml::Data;
using namespace Windows::UI::Xaml::Input;
using namespace Windows::UI::Xaml::Media;
using namespace Windows::UI::Xaml::Navigation;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=402352&clcid=0x409
extern "C" void SendTelemetryEvents();
MainPage::MainPage()
{
InitializeComponent();
}
void MainPage::button_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
{
testOneEvent();
SendTelemetryEvents();
}

23
Solutions/uap-cpp/MainPage.xaml.h
Просмотреть файл

@ -1,23 +0,0 @@
//
// MainPage.xaml.h
// Declaration of the MainPage class.
//
#pragma once
#include "MainPage.g.h"
namespace UAPCPP
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
public ref class MainPage sealed
{
public:
MainPage();
private:
void button_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
};
}

50
Solutions/uap-cpp/TraceLogSample.cpp
Просмотреть файл

@ -1,50 +0,0 @@
#include "TraceLogSample.hpp"
TRACELOGGING_DEFINE_PROVIDER(
g_hMyComponentProvider,
"Microsoft.Applications.Telemetry.Windows",
// {a6ce7a34-333a-5ae5-941a-018327c608a0}
(0x5ECB0BAC, 0xB930, 0x47F5, 0xA8, 0xA4, 0xE8, 0x25, 0x35, 0x29, 0xED, 0xB7),
// (0xa6ce7a34, 0x333a, 0x5ae5, 0x94, 0x1a, 0x01, 0x83, 0x27, 0xc6, 0x08, 0xa0),
TraceLoggingOptionMicrosoftPartnerTelemetry());
extern "C" void testTraceLogging() {
// Register the provider
int status = TraceLoggingRegister(g_hMyComponentProvider);
if (SUCCEEDED(status)) {
OutputDebugStringA("Provider successfully registered\n");
// Log an event
for (int i = 0; i < 10; i++) {
testOneEvent();
}
}
else {
OutputDebugStringA("There was an error registering a provider!\n");
}
}
extern "C" void testOneEvent() {
char level = 255;
OutputDebugStringA("testOneEvent\n");
bool status = TraceLoggingProviderEnabled(g_hMyComponentProvider, 0, 0);
OutputDebugStringA((status) ?
"Provider enabled." :
"Provider disabled!"
);
TraceLoggingWrite(
g_hMyComponentProvider,
"SampleEvent1",
// TraceLoggingKeyword(MICROSOFT_KEYWORD_TELEMETRY),
TraceLoggingEventTag(MICROSOFT_EVENTTAG_REALTIME_LATENCY),
TraceLoggingEventTag(MICROSOFT_EVENTTAG_CRITICAL_PERSISTENCE),
TraceLoggingString("Hello TraceLogging!", "GreetingField")
);
}
extern "C" void testUnregister() {
// Unregister
TraceLoggingUnregister(g_hMyComponentProvider);
}

40
Solutions/uap-cpp/TraceLogSample.hpp
Просмотреть файл

@ -1,40 +0,0 @@
#pragma once
#include <windows.h>
#include <TraceLoggingProvider.h>
TRACELOGGING_DECLARE_PROVIDER(g_hMyComponentProvider);
#define ARIA_PROVIDER_GUID (0x5ECB0BAC, 0xB930, 0x47F5, 0xA8, 0xA4, 0xE8, 0x25, 0x35, 0x29, 0xED, 0xB7)
//(0xa6ce7a34, 0x333a, 0x5ae5, 0x94, 0x1a, 0x01, 0x83, 0x27, 0xc6, 0x08, 0xa0)
#define TraceLoggingOptionMicrosoftPartnerTelemetry() TraceLoggingOptionGroup ARIA_PROVIDER_GUID
#define MICROSOFT_KEYWORD_CRITICAL_DATA 0x0000800000000000 // Bit 47
#define MICROSOFT_KEYWORD_MEASURES 0x0000400000000000 // Bit 46
#define MICROSOFT_KEYWORD_TELEMETRY 0x0000200000000000 // Bit 45
#define MICROSOFT_KEYWORD_RESERVED_44 0x0000100000000000 // Bit 44 (reserved for future assignment)
#define MICROSOFT_EVENTTAG_CORE_DATA 0x00080000
#define MICROSOFT_EVENTTAG_INJECT_XTOKEN 0x00100000
#define MICROSOFT_EVENTTAG_REALTIME_LATENCY 0x00200000
#define MICROSOFT_EVENTTAG_NORMAL_LATENCY 0x00400000
#define MICROSOFT_EVENTTAG_CRITICAL_PERSISTENCE 0x00800000
#define MICROSOFT_EVENTTAG_NORMAL_PERSISTENCE 0x01000000
#define MICROSOFT_EVENTTAG_DROP_PII 0x02000000
#define MICROSOFT_EVENTTAG_HASH_PII 0x04000000
#define MICROSOFT_EVENTTAG_MARK_PII 0x08000000
#define MICROSOFT_FIELDTAG_DROP_PII 0x04000000
#define MICROSOFT_FIELDTAG_HASH_PII 0x08000000
extern "C" {
void testTraceLogging();
void testOneEvent();
void testUnregister();
};

233
Solutions/uap-cpp/UAPCPP.vcxproj
Просмотреть файл

@ -1,233 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{39dbd601-4d79-49f9-ad18-065404dba273}</ProjectGuid>
<RootNamespace>UAPCPP</RootNamespace>
<DefaultLanguage>en-US</DefaultLanguage>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
<AppContainerApplication>true</AppContainerApplication>
<ApplicationType>Windows Store</ApplicationType>
<ApplicationTypeRevision>8.2</ApplicationTypeRevision>
<WindowsTargetPlatformVersion>10.0.15005.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ProjectName>uap-cpp</ProjectName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM">
<Configuration>Debug</Configuration>
<Platform>ARM</Platform>
</ProjectConfiguration>
<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|ARM">
<Configuration>Release</Configuration>
<Platform>ARM</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 Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<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|ARM'">
<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|ARM'">
<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>
<PackageCertificateKeyFile>TemporaryKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>8E0B7DDB34A9A10024A12ACE6EAB0CCF5AD3CD4B</PackageCertificateThumbprint>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<CodeAnalysisRuleSet>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Team Tools\Static Analysis Tools\Rule Sets\NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
<AdditionalIncludeDirectories>C:\newCPPCode\client-shared_utility_clienttelemetry\lib\api;C:\newCPPCode\client-shared_utility_clienttelemetry\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<CallingConvention>Cdecl</CallingConvention>
<EnablePREfast>true</EnablePREfast>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile />
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<ClCompile>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
<AdditionalIncludeDirectories>..\..\..\include;$(ProjectDir);$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_ARM_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
<EnablePREfast>true</EnablePREfast>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile />
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
<AdditionalIncludeDirectories>C:\newCPPCode\client-shared_utility_clienttelemetry\lib\api;C:\newCPPCode\client-shared_utility_clienttelemetry\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<BrowseInformation>true</BrowseInformation>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile />
</ClCompile>
<Bscmake>
<PreserveSbr>true</PreserveSbr>
</Bscmake>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
<AdditionalIncludeDirectories>..\..\..\include;$(ProjectDir);$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile />
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
<AdditionalIncludeDirectories>C:\newCPPCode\client-shared_utility_clienttelemetry\lib\api;C:\newCPPCode\client-shared_utility_clienttelemetry\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile />
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
<AdditionalIncludeDirectories>..\..\..\include;$(ProjectDir);$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_UNICODE;UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile />
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
<ClInclude Include="App.xaml.h">
<DependentUpon>App.xaml</DependentUpon>
</ClInclude>
<ClInclude Include="TraceLogSample.hpp" />
<ClInclude Include="MainPage.xaml.h">
<DependentUpon>MainPage.xaml</DependentUpon>
</ClInclude>
<ClInclude Include="pch.h" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainPage.xaml">
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
</ItemGroup>
<ItemGroup>
<ClCompile Include="App.xaml.cpp">
<DependentUpon>App.xaml</DependentUpon>
</ClCompile>
<ClCompile Include="MainPage.xaml.cpp">
<DependentUpon>MainPage.xaml</DependentUpon>
</ClCompile>
<ClCompile Include="TraceLogSample.cpp" />
</ItemGroup>
<ItemGroup>
<Image Include="Assets\Logo.scale-100.png" />
<Image Include="Assets\SmallLogo.scale-100.png" />
<Image Include="Assets\SplashScreen.scale-100.png" />
<Image Include="Assets\StoreLogo.scale-100.png" />
<Image Include="Assets\WideLogo.scale-100.png" />
</ItemGroup>
<ItemGroup>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(SolutionDir)\build.props" Condition="Exists('$(SolutionDir)\build.props')" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>

48
Solutions/uap-cpp/UAPCPP.vcxproj.filters
Просмотреть файл

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ApplicationDefinition Include="App.xaml" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="App.xaml.cpp" />
<ClCompile Include="MainPage.xaml.cpp" />
<ClCompile Include="TraceLogSample.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="App.xaml.h" />
<ClInclude Include="MainPage.xaml.h" />
<ClInclude Include="pch.h" />
<ClInclude Include="TraceLogSample.hpp" />
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest" />
</ItemGroup>
<ItemGroup>
<Page Include="MainPage.xaml" />
</ItemGroup>
<ItemGroup>
<Filter Include="Assets">
<UniqueIdentifier>{8ceab220-6514-45d3-bcad-00b239944d07}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<Image Include="Assets\Logo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SmallLogo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SplashScreen.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\StoreLogo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\WideLogo.scale-100.png">
<Filter>Assets</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project>

4
Solutions/uap-cpp/packages.config
Просмотреть файл

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Bond.Compiler" version="4.2.1" targetFramework="native" />
</packages>

6
Solutions/uncrustify.ignore
Просмотреть файл

@ -1,6 +0,0 @@
win10-dll/Win32/
win10-dll/64/
win32-dll/Win32/
win32-dll/x64/
out/

2
Solutions/version.txt
Просмотреть файл

@ -1 +1 @@
3.1.999.1
3.2.999.1

34
Solutions/win10-cs/win10-cs.vcxproj
Просмотреть файл

@ -108,7 +108,7 @@
<Import Project="..\Clienttelemetry\Clienttelemetry.vcxitems" Label="Shared" />
<Import Project="..\..\lib\pal\universal\universal.vcxitems" Label="Shared" />
<Import Project="..\..\lib\shared\Shared.vcxitems" Label="Shared" />
<Import Project="..\exp\exp.vcxitems" Label="Shared" />
<Import Project="..\..\lib\modules\exp\exp.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" />
@ -175,8 +175,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;_CRTDBG_MAP_ALLOC;USE_TIMERSHIM2;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;_CRTDBG_MAP_ALLOC;USE_TIMERSHIM2;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;MATSDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<BrowseInformation>false</BrowseInformation>
@ -213,8 +213,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;MATSDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -247,8 +247,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;USE_TIMERSHIM2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;USE_TIMERSHIM2;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_WINRT_DLL;MATSDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CallingConvention>Cdecl</CallingConvention>
<CompileAsManaged>false</CompileAsManaged>
<ExceptionHandling>Async</ExceptionHandling>
@ -280,8 +280,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_PHONE_APP;_WINRT_DLL;MATSDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -314,8 +314,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;USE_TIMERSHIM2;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;USE_TIMERSHIM2;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;MATSDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<CompileAsManaged>false</CompileAsManaged>
@ -348,8 +348,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;ARIASDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_WINRT_DLL;MATSDK_SHARED_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -381,10 +381,10 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<SupportJustMyCode>false</SupportJustMyCode>
<CompileAsManaged>false</CompileAsManaged>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>sqlite-uwp.lib;zlib.lib;WindowsApp.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -398,9 +398,9 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>false</CompileAsManaged>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;WIN10_CS;WINAPI_FAMILY=WINAPI_FAMILY_APP;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>

34
Solutions/win10-dll/win10-dll.vcxproj
Просмотреть файл

@ -101,7 +101,7 @@
<ImportGroup Label="Shared">
<Import Project="..\Clienttelemetry\Clienttelemetry.vcxitems" Label="Shared" />
<Import Project="..\..\lib\pal\universal\universal.vcxitems" Label="Shared" />
<Import Project="..\exp\exp.vcxitems" Label="Shared" />
<Import Project="..\..\lib\modules\exp\exp.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" />
@ -171,8 +171,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<BrowseInformation>false</BrowseInformation>
@ -207,8 +207,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -237,8 +237,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CallingConvention>Cdecl</CallingConvention>
<ExceptionHandling>Async</ExceptionHandling>
<WarningLevel>Level3</WarningLevel>
@ -269,8 +269,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -300,8 +300,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<ExceptionHandling>Async</ExceptionHandling>
@ -333,8 +333,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -364,8 +364,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<SupportJustMyCode>false</SupportJustMyCode>
<WarningLevel>Level3</WarningLevel>
<CompileAsManaged>false</CompileAsManaged>
@ -383,8 +383,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_WINDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WarningLevel>Level3</WarningLevel>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<Optimization>MinSpace</Optimization>

36
Solutions/win10-lib/win10-lib.vcxproj
Просмотреть файл

@ -165,8 +165,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<BrowseInformation>false</BrowseInformation>
@ -195,8 +195,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -222,8 +222,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CallingConvention>Cdecl</CallingConvention>
<ExceptionHandling>Async</ExceptionHandling>
<WarningLevel>Level4</WarningLevel>
@ -247,8 +247,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -276,8 +276,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -303,8 +303,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CallingConvention>Cdecl</CallingConvention>
<ExceptionHandling>Async</ExceptionHandling>
@ -329,8 +329,8 @@
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<CompileAsWinRT>true</CompileAsWinRT>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<Optimization>MinSpace</Optimization>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<CallingConvention>Cdecl</CallingConvention>
@ -357,8 +357,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ControlFlowGuard>Guard</ControlFlowGuard>
<CompileAsWinRT>true</CompileAsWinRT>
</ClCompile>
@ -366,8 +366,8 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
<ClCompile>
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB;_WINRT_DLL;_CRT_SECURE_NO_WARNINGS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<ControlFlowGuard>Guard</ControlFlowGuard>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CompileAsWinRT>true</CompileAsWinRT>

11
Solutions/win32-dll/win32-dll.vcxproj
Просмотреть файл

@ -105,13 +105,12 @@
<ImportGroup Label="Shared">
<Import Project="..\Clienttelemetry\Clienttelemetry.vcxitems" Label="Shared" />
<Import Project="..\..\lib\pal\desktop\desktop.vcxitems" Label="Shared" />
<Import Project="..\exp\exp.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">
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IncludePath Condition="'$(RunOACR)'!='Yes'">$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup>
@ -165,8 +164,8 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
@ -255,8 +254,8 @@
<Optimization Condition="'$(Platform)'=='ARM64'">MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<AssemblerOutput>All</AssemblerOutput>

18
Solutions/win32-lib/win32-lib.vcxproj
Просмотреть файл

@ -161,7 +161,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IncludePath Condition="'$(RunOACR)'!='Yes'">$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup>
@ -258,8 +258,8 @@
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
@ -323,8 +323,8 @@
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
@ -395,8 +395,8 @@
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<AssemblerOutput>All</AssemblerOutput>
@ -468,8 +468,8 @@
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<AssemblerOutput>All</AssemblerOutput>

10
Solutions/win32-mini-dll/win32-mini-dll.vcxproj
Просмотреть файл

@ -102,7 +102,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IncludePath Condition="'$(RunOACR)'!='Yes'">$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup>
@ -168,8 +168,8 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
@ -290,8 +290,8 @@
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;ARIASDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_SHARED_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<AssemblerOutput>All</AssemblerOutput>

18
Solutions/win32-mini-lib/win32-mini-lib.vcxproj
Просмотреть файл

@ -161,7 +161,7 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros">
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories Condition="'$(RunOACR)'=='Yes'">$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<IncludePath Condition="'$(RunOACR)'!='Yes'">$(SolutionDir)..;$(SolutionDir)..\zlib;$(SolutionDir)..\sqlite;$(SolutionDir)\..\lib\pal\;$(UniversalCRT_IncludePath);$(VC_IncludePath);$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup>
@ -269,8 +269,8 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
@ -372,8 +372,8 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
<Optimization>MinSpace</Optimization>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
@ -482,8 +482,8 @@
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>false</IntrinsicFunctions>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<AssemblerOutput>All</AssemblerOutput>
@ -584,8 +584,8 @@
<Optimization Condition="'$(Platform)'=='ARM64'">MinSpace</Optimization>
<FunctionLevelLinking>false</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;ARIASDK_STATIC_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\aria;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>CONFIG_CUSTOM_H="config-compact-noutc.h";ZLIB_WINAPI;WIN32;MATSDK_STATIC_LIB=1;_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;WINVER=_WIN32_WINNT_WIN7;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\lib;$(ProjectDir)..\..\lib\include\public;$(ProjectDir)..\..\lib\include\mat;$(ProjectDir)..\..\lib\include;$(ProjectDir)..\..\bondlite\include;$(ProjectDir);$(GeneratedFilesDir);$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<CompileAsManaged>false</CompileAsManaged>
<CompileAsWinRT>false</CompileAsWinRT>
<AssemblerOutput>All</AssemblerOutput>

2
build-Win32Debug.bat
Просмотреть файл

@ -7,7 +7,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Too
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
set platform=
set SOLUTION=Solutions\AriaSDK.sln
set SOLUTION=Solutions\MSTelemetrySDK.sln
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=Debug /p:Platform=Win32
Solutions\out\Debug\Win32\UnitTests\UnitTests.exe

2
build-Win32Release.bat
Просмотреть файл

@ -7,7 +7,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Too
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
set platform=
set SOLUTION=Solutions\AriaSDK.sln
set SOLUTION=Solutions\MSTelemetrySDK.sln
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

2
build-all.bat
Просмотреть файл

@ -7,7 +7,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Too
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
set platform=
set SOLUTION=Solutions\AriaSDK.sln
set SOLUTION=Solutions\MSTelemetrySDK.sln
set CUSTOM_PROPS=
if ("%1"=="") goto skip

2
build-x64Debug.bat
Просмотреть файл

@ -7,7 +7,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Too
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
set platform=
set SOLUTION=Solutions\AriaSDK.sln
set SOLUTION=Solutions\MSTelemetrySDK.sln
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=Debug /p:Platform=x64
Solutions\out\Debug\x64\UnitTests\UnitTests.exe

2
build-x64Release.bat
Просмотреть файл

@ -7,7 +7,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\Too
set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
set platform=
set SOLUTION=Solutions\AriaSDK.sln
set SOLUTION=Solutions\MSTelemetrySDK.sln
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=x64
Solutions\out\Release\x64\UnitTests\UnitTests.exe

10
build.sh
Просмотреть файл

@ -87,14 +87,14 @@ fi
# Install SDK headers and lib to /usr/local
#
## TODO: [MG] - fix this section for shared library
## strip --strip-unneeded out/lib/libaria.so
## strip -S --strip-unneeded --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag out/lib/libaria.so
## strip --strip-unneeded out/lib/libmat.so
## strip -S --strip-unneeded --remove-section=.note.gnu.gold-version --remove-section=.comment --remove-section=.note --remove-section=.note.gnu.build-id --remove-section=.note.ABI-tag out/lib/libmat.so
if [ "$CMAKE_PACKAGE_TYPE" == "tgz" ]; then
cd ..
ARIA_SDK_INSTALL_DIR="${ARIA_SDK_INSTALL_DIR:-/usr/local}"
MATSDK_INSTALL_DIR="${MATSDK_INSTALL_DIR:-/usr/local}"
echo "+-----------------------------------------------------------------------------------+"
echo " This step may prompt for your sudo password to deploy SDK to $ARIA_SDK_INSTALL_DIR "
echo " This step may prompt for your sudo password to deploy SDK to $MATSDK_INSTALL_DIR "
echo "+-----------------------------------------------------------------------------------+"
sudo ./install.sh $ARIA_SDK_INSTALL_DIR
sudo ./install.sh $MATSDK_INSTALL_DIR
fi

70
docs/Building.md
Просмотреть файл

@ -1,70 +0,0 @@
Building
--------
The SDK can be built in two fundamentally different ways – using Skype
toolchain or using plain CMake and platform tools.
### Stand-alone build
- Make sure that CMake, Visual Studio 2015 and Windows SDK are
installed
- Obtain 3rd party libraries (SQLite, Google Test/Mock)
- Although this way of building does not depend on any
Skype-specific libraries, it still needs some other 3rd party
external ones. They can be built locally beforehand or obtained
in a binary form from some other source.
- The following locations contain the necessary binaries prebuilt
for Skype:
- <https://nexus.skype.net/content/repositories/skype/skype/porting/gmock/gmock17/1.7.0.53/win-i386-vs2015xp-crtdynamic/gmock-lib-1.7.0.53.tgz>
- <https://nexus.skype.net/content/repositories/skype/skype/porting/gmock/gmock17/1.7.0.53/gmock-headers-1.7.0.53.tgz>
- <https://nexus.skype.net/content/repositories/skype-ivy/skype/client-shared_utility/zlib/master/win-x86_vs2015-crtdynamic-debug/1.2.8.79/zlib-1.2.8.79.tgz>
- <https://nexus.skype.net/content/repositories/thirdparty/sqlite/sqlite-win-x86_vs2015-crtdynamic-debug/3.8.7.4.76/sqlite.tgz>
- Extract them into folder `sysroot` in the project directory
(there will be just one `sysroot\include` and one
`sysroot\lib`, containing mix of files from
different libraries)
- Generate Visual Studio project (in project's root directory):
- `mkdir Solutions`
- `cd Solutions`
- `cmake .. -DBUILD_UNIT_TESTS=YES -DBUILD_FUNC_TESTS=YES`
- Open the project in Visual Studio:
- `start AriaSDK.sln`
- This kind of build is limited to the Win32 PAL.
### Skype builds
The library is a standard "dev\_buildtools" project, so the usual steps
are needed to build it.
- Make sure Skype Ant and Cygwin are installed
- Skype Ant can be downloaded from
<https://nexus.skype.net/content/repositories/skype/skype/engineering-services/skype-ant/>,
pick the latest version and extract the `skype-ant` directory to
this project's root directory
- Cygwin (64-bit version recommended) can be obtained from
<https://cygwin.com/setup-x86_64.exe>, just a basic installation
is needed (with tools like `tar` or `unzip`).
- Make sure Nexus credentials are set in `~/build.properties`
correctly:
nexus.user=msad_alias
nexus.passwd=msad_password
- Have the latest dev\_buildtools
- `git clone https://skype.visualstudio.com/SCC/_git/dev_buildtools`
- `dev_buildtools` should be in this project's root directory
- Pull new changes in case of problems with dependencies etc.
- In order to fetch dependencies (with Cygwin in path):
- `skype-ant\bin\ant -Dqb.buildConfig=win-x86_vs2015-crtdynamic -Dqb.flavor=debug -Dbuild.version=0.0.0.0 cfw.dev-fetch`
- In order to generate (Visual Studio) project (with Cygwin in path):
- `skype-ant\bin\ant -Dqb.buildConfig=win-x86_vs2015-crtdynamic -Dqb.flavor=debug -Dbuild.version=0.0.0.0 "-Dcmake.generator=Visual Studio 14" -Dcustom-cmake-args="-DBUILD_UNIT_TESTS=yes -DBUILD_FUNC_TESTS=yes" cfw.generate`
- `start Solutions\AriaSDK.sln` to open in VS
- Both the previous actions can be also done with the GUI helper
`dev_buildtools\local\generate-vs-gui.cmd`.
- The EDIT\_CACHE project can be used to edit build parameters (e.g.
build version or PAL type) from withing the VS IDE.
- In order to use this with the Win32 PAL (as opposed to Skype PAL),
use EDIT\_CACHE to change `PAL_IMPLEMENTATION` from the CMake GUI or
set it during the `cfw.generate` step right away.

41
docs/Coding style.md
Просмотреть файл

@ -55,45 +55,6 @@ this order:
C++ code
--------
#### Uncrustify
After a tedious evaluation process,
[Uncrustify](http://uncrustify.sourceforge.net/) has been chosen as the
tool to use for C++ source code processing and validation, because it is
free, open source and highly customizable.
There are two related files stored in project's root directory -
`uncrustify.cfg` contains the settings for Uncrustify itself,
`uncrustify.ignore` contains partial path patterns to ignore while
performing the formatting validation.
#### Recommended process
1. Modify files and commit: `git add ...`, `git commit`.
2. Format in place:
`uncrustify -c uncrustify.cfg --no-backup <modified-file1> <modified-file2> ...`
3. Verify: `git diff`
4. If changed, edit if necessary and amend the commit: `git add ...`,
`git commit --amend --no-edit`.
#### Exceptions
It is possible to turn off formatting temporarily for a block of code by
comments containing `*INDENT-OFF*` and `*INDENT-ON*`, respectively. This
should be used only sparingly, if really necessary. Additional
explanatory comment should be written after `*INDENT-OFF*` to describe
why the suppression was necessary.
Good usage:
- Avoid chained namespaces indenting their whole content by 50 spaces.
- Angle brackets in `std::min<int>(...)` misunderstood as comparison
operators and adding extra space.
Bad usage:
- I don't like a blank line between functions etc.
#### Rules (non-exhaustive list)
- Indentation
@ -198,7 +159,7 @@ CMake scripts
Markdown documentation
----------------------
- Non-GFM (Github Flavored Markdown), hard wrapped at 80 characters.
- GitHub Flavored Markdown
- Trailing white space (two spaces at end of line) is allowed as an
official means to insert a hard line break.
- Everything in English, with clear full sentences, without colloquial

Двоичные данные
examples/ExpClientCppUWP/TemporaryKey.pfx
Просмотреть файл

Двоичный файл не отображается.

Двоичные данные
examples/HelloAriaUWP/Assets/Logo.scale-100.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 801 B

Двоичные данные
examples/HelloAriaUWP/Assets/SmallLogo.scale-100.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 1.4 KiB

Двоичные данные
examples/HelloAriaUWP/Assets/SplashScreen.scale-100.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 2.1 KiB

Двоичные данные
examples/HelloAriaUWP/Assets/StoreLogo.scale-100.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 429 B

Двоичные данные
examples/HelloAriaUWP/Assets/WideLogo.scale-100.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 2.1 KiB

13
examples/HelloAriaUWP/BlankPage.xaml
Просмотреть файл

@ -1,13 +0,0 @@
<Page
x:Class="UAPCPP.BlankPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:UAPCPP"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d">
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Button x:Name="button" Content="Button" HorizontalAlignment="Left" Margin="133,245,0,0" VerticalAlignment="Top" Click="button_Click"/>
</Grid>
</Page>

33
examples/HelloAriaUWP/BlankPage.xaml.cpp
Просмотреть файл

@ -1,33 +0,0 @@
//
// BlankPage.xaml.cpp
// Implementation of the BlankPage class
//
#include "pch.h"
#include "BlankPage.xaml.h"
using namespace UAPCPP;
using namespace Platform;
using namespace Windows::Foundation;
using namespace Windows::Foundation::Collections;
using namespace Windows::UI::Xaml;
using namespace Windows::UI::Xaml::Controls;
using namespace Windows::UI::Xaml::Controls::Primitives;
using namespace Windows::UI::Xaml::Data;
using namespace Windows::UI::Xaml::Input;
using namespace Windows::UI::Xaml::Media;
using namespace Windows::UI::Xaml::Navigation;
// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238
BlankPage::BlankPage()
{
InitializeComponent();
}
void UAPCPP::BlankPage::button_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e)
{
}

23
examples/HelloAriaUWP/BlankPage.xaml.h
Просмотреть файл

@ -1,23 +0,0 @@
//
// BlankPage.xaml.h
// Declaration of the BlankPage class
//
#pragma once
#include "BlankPage.g.h"
namespace UAPCPP
{
/// <summary>
/// An empty page that can be used on its own or navigated to within a Frame.
/// </summary>
[Windows::Foundation::Metadata::WebHostHidden]
public ref class BlankPage sealed
{
public:
BlankPage();
private:
void button_Click(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e);
};
}

26
examples/HelloAriaUWP/Package.appxmanifest
Просмотреть файл

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="25df8949-58b5-491c-929b-d1e99ae0040b" Publisher="CN=ARIA SDK Team" Version="1.0.12.0" />
<mp:PhoneIdentity PhoneProductId="25df8949-58b5-491c-929b-d1e99ae0040b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>UAPCPP</DisplayName>
<PublisherDisplayName>votrubac</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo>
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.10069.0" MaxVersionTested="10.0.10069.0" />
</Dependencies>
<Resources>
<Resource Language="x-generate" />
</Resources>
<Applications>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="UAPCPP.App">
<uap:VisualElements DisplayName="UAPCPP" Square150x150Logo="Assets\Logo.png" Square44x44Logo="Assets\SmallLogo.png" Description="UAPCPP" BackgroundColor="#464646">
<uap:SplashScreen Image="Assets\SplashScreen.png" />
</uap:VisualElements>
</Application>
</Applications>
<Capabilities>
<Capability Name="internetClient" />
</Capabilities>
</Package>

1
examples/HelloAriaUWP/pch.h
Просмотреть файл

@ -1 +0,0 @@
#pragma once

18
examples/GuestCAPI/CMakeLists.txt → examples/c/SampleC-Guest/CMakeLists.txt
Просмотреть файл

@ -5,15 +5,15 @@ project(GuestCAPI)
#set(CMAKE_SYSTEM_PROCESSOR i386)
# For ARM / Raspberry Pi 3 cross-compile
# set(ARIA_SDK_LIB /usr/local/lib/armv7l-linux-gnu)
# set(MATSDK_LIB /usr/local/lib/armv7l-linux-gnu)
# Point example to SDK dirs for x86_64 Desktop
if(EXISTS "/usr/local/lib/libaria.a")
# Use local libaria.a
set(ARIA_SDK_LIB /usr/local/lib/)
if(EXISTS "/usr/local/lib/libmat.a")
# Use local libmat.a
set(MATSDK_LIB /usr/local/lib/)
else()
# Use architecture-specific libaria.a
set(ARIA_SDK_LIB /usr/local/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu)
# Use architecture-specific libmat.a
set(MATSDK_LIB /usr/local/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu)
endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -ggdb -gdwarf-2 -std=c11")
@ -21,10 +21,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb -gdwarf-2 -std=c++11")
find_package (Threads)
set(ARIA_SDK_INCLUDE /usr/local/include/aria)
set(MATSDK_INCLUDE /usr/local/include/mat)
# Aria SDK to include dirs
include_directories( . ${ARIA_SDK_INCLUDE} )
include_directories( . ${MATSDK_INCLUDE} )
# Link main.cpp to executable
add_executable(GuestCAPI main.cpp demo.c)
@ -43,4 +43,4 @@ if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set (PLATFORM_LIBS "-framework CoreFoundation -framework IOKit")
endif()
target_link_libraries(GuestCAPI ${ARIA_SDK_LIB}/libaria.a curl z ${CMAKE_THREAD_LIBS_INIT} ${SQLITE3_LIB} ${PLATFORM_LIBS} dl)
target_link_libraries(GuestCAPI ${MATSDK_LIB}/libmat.a curl z ${CMAKE_THREAD_LIBS_INIT} ${SQLITE3_LIB} ${PLATFORM_LIBS} dl)

0
examples/GuestCAPI/build.sh → examples/c/SampleC-Guest/build.sh Executable file → Normal file
Просмотреть файл

5
examples/GuestCAPI/demo.c → examples/c/SampleC-Guest/demo.c
Просмотреть файл

@ -4,7 +4,8 @@
#include <Windows.h>
#endif
#include <aria.h>
#include "mat.h"
#include <stdio.h>
#include <stdlib.h>
@ -54,7 +55,7 @@ void test_c_api_guest()
PII_STR("piiKey", "secret", 1), // TODO: copy-paste-translate the Pii Kind enum from C++ to C
// Part "X" demo - populating CS extension props
// Common Data Extensions.App
PII_STR("ext.app.userId", "maxgolov@microsoft.com", 1),
PII_STR("ext.app.userId", "jackfrost@microsoft.com", 1),
_STR("ext.app.ver", "1.0.0")
);

0
examples/GuestCAPI/main.cpp → examples/c/SampleC-Guest/main.cpp
Просмотреть файл

0
examples/GuestCAPI/run-tests.sh → examples/c/SampleC-Guest/run-tests.sh Executable file → Normal file
Просмотреть файл

0
examples/HelloCAPI/HelloCAPI.sln → examples/c/SampleC/HelloCAPI.sln
Просмотреть файл

2
examples/HelloCAPI/HelloCAPI.vcxproj → examples/c/SampleC/HelloCAPI.vcxproj
Просмотреть файл

@ -95,7 +95,7 @@
<ClCompile Include="main.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\aria.h" />
<ClInclude Include="include\mat.h" />
<ClInclude Include="include\CAPIClient.hpp" />
<ClInclude Include="include\ctmacros.hpp" />
<ClInclude Include="include\Version.h" />

2
examples/HelloCAPI/HelloCAPI.vcxproj.filters → examples/c/SampleC/HelloCAPI.vcxproj.filters
Просмотреть файл

@ -20,7 +20,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="include\aria.h">
<ClInclude Include="include\mat.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="include\CAPIClient.hpp">

2
examples/HelloCAPI/deploy-dll.cmd → examples/c/SampleC/deploy-dll.cmd
Просмотреть файл

@ -2,7 +2,7 @@
set PROJECT_DIR=%~dp0
mkdir %PROJECT_DIR%\include
copy %PROJECT_DIR%..\..\lib\include\public\aria.h %PROJECT_DIR%\include
copy %PROJECT_DIR%..\..\lib\include\public\mat.h %PROJECT_DIR%\include
copy %PROJECT_DIR%..\..\lib\include\public\Version.h %PROJECT_DIR%\include
copy %PROJECT_DIR%..\..\lib\include\public\ctmacros.hpp %PROJECT_DIR%\include

74
examples/c/SampleC/main.c Normal file
Просмотреть файл

@ -0,0 +1,74 @@
#include <stdio.h>
#include <stdlib.h>
#define _CRT_SECURE_LOG_S
#include "mat.h"
#define API_KEY "6d084bbf6a9644ef83f40a77c9e34580-c2d379e0-4408-4325-9b4d-2a7d78131e14-7322"
char* config =
"{"
"\"cacheFilePath\":\"MyOfflineStorage.db\"," // Custom storage path
"\"config\":{\"host\": \"*\"}," // Attach as guest to any host
"\"name\":\"C-API-Client-0\"," // Module ID
"\"version\":\"1.0.0\"," // Module semver
"\"primaryToken\":\"" API_KEY "\"," // Primary Token
"\"maxTeardownUploadTimeInSec\":5," // Allow up to 5 seconds for upload
"\"hostMode\":false," // Explicitly declare yourself as guest
"\"minimumTraceLevel\":0," // Debug printout level
"\"sdkmode\":0" // SDK direct-upload mode
"}";
void test_c_api()
{
evt_handle_t handle;
evt_prop event[] = TELEMETRY_EVENT
(
// Common Data Extensions.Envelope - reserved keywords that C API should not use.
// Alternate solution is to declare a special macro for envelope 'root' namespace props,
// such as $STR, $INT, etc.
_STR("name", "Event.Name.Pure.C.vs2010"), // Represents the uniquely qualified name for the event
_STR("ver", "3.0"), // Represents the major and minor version of the extension
_STR("time", "1979-08-12"), // Represents the event date time in Coordinated Universal Time(UTC) when the event was generated on the client.This should be in ISO 8601 format
_INT("popSample", 100), // Represents the effective sample rate for this event at the time it was generated by a client
// FIXME: [MG] - iKey should only be needed if logging to alternate token, otherwise we should use the primaryToken by default
_STR("iKey", API_KEY), // Represents an ID for applications or other logical groupings of events.
_INT("flags", 0xffffffff), // Represents a collection of bits that describe how the event should be processed ...
_STR("cV", "12345"), // Represents the Correlation Vector : A single field for tracking partial order of related telemetry events across component boundaries.
// Customer Data fields go as part of userdata
_STR("strKey", "value1"),
_INT("intKey", 12345),
PII_STR("piiKey", "secret", 1), // TODO: copy-paste-translate the Pii Kind enum from C++ to C
// Part "X" demo - populating CS extension props
// Common Data Extensions.App
PII_STR("ext.app.userId", "jackfrost@microsoft.com", 1),
_STR("ext.app.ver", "1.0.0")
);
#ifdef _WIN32
// It is possible to delay-load the loading of default ClientTelemetry.dll ,
// then load an alternate implementation with a matching set of exported syms.
// That way the calls are essentially redirected to user-supplied telemetry
printf("Testing custom implementation library...\n");
evt_load((evt_handle_t)LoadLibrary(L"ClientTelemetry2.dll"));
#endif
printf("Testing C API...\n");
handle = evt_open(config);
// Ref. https://docs.microsoft.com/en-us/windows/privacy/basic-level-windows-diagnostic-events-and-fields for description of Common Schema fields
evt_log(handle, event);
evt_flush(handle);
// FIXME: [MG] - default settings are optimized for 'fast shutdown' and not giving enough time for SDK to upload the event logged.
// However, if you restart this sample - events from a previous run get uploaded. Modify the
evt_upload(handle);
evt_close(handle);
}
int main(int argc, char *argv[])
{
printf("Hello, C API!\n");
test_c_api();
return 0;
}

20
examples/HelloAria/CMakeLists.txt → examples/cpp/SampleCpp/CMakeLists.txt
Просмотреть файл

@ -5,15 +5,15 @@ project(HelloAria)
#set(CMAKE_SYSTEM_PROCESSOR i386)
# For ARM / Raspberry Pi 3 cross-compile
# set(ARIA_SDK_LIB /usr/local/lib/armv7l-linux-gnu)
# set(MAT_SDK_LIB /usr/local/lib/armv7l-linux-gnu)
# Point example to SDK dirs for x86_64 Desktop
if(EXISTS "/usr/local/lib/libaria.a")
# Use local libaria.a
set(ARIA_SDK_LIB /usr/local/lib/)
if(EXISTS "/usr/local/lib/libmat.a")
# Use local libmat.a
set(MAT_SDK_LIB /usr/local/lib/)
else()
# Use architecture-specific libaria.a
set(ARIA_SDK_LIB /usr/local/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu)
# Use architecture-specific libmat.a
set(MAT_SDK_LIB /usr/local/lib/${CMAKE_SYSTEM_PROCESSOR}-linux-gnu)
endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -ggdb -gdwarf-2 -std=c11")
@ -21,10 +21,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -ggdb -gdwarf-2 -std=c++11")
find_package (Threads)
set(ARIA_SDK_INCLUDE /usr/local/include/aria)
set(MAT_SDK_INCLUDE /usr/local/include/aria)
# Aria SDK to include dirs
include_directories( . ${ARIA_SDK_INCLUDE} )
include_directories( . ${MAT_SDK_INCLUDE} )
# Link main.cpp to executable
add_executable(HelloAria main.cpp DebugCallback.cpp demo.c)
@ -44,6 +44,6 @@ set (PLATFORM_LIBS "-framework CoreFoundation -framework IOKit")
endif()
#tcmalloc turned off by default
#target_link_libraries(HelloAria ${ARIA_SDK_LIB}/libaria.a curl z ${CMAKE_THREAD_LIBS_INIT} ${SQLITE3_LIB} dl tcmalloc)
#target_link_libraries(HelloAria ${MAT_SDK_LIB}/libmat.a curl z ${CMAKE_THREAD_LIBS_INIT} ${SQLITE3_LIB} dl tcmalloc)
target_link_libraries(HelloAria ${ARIA_SDK_LIB}/libaria.a curl z ${CMAKE_THREAD_LIBS_INIT} ${SQLITE3_LIB} ${PLATFORM_LIBS} dl)
target_link_libraries(HelloAria ${MAT_SDK_LIB}/libmat.a curl z ${CMAKE_THREAD_LIBS_INIT} ${SQLITE3_LIB} ${PLATFORM_LIBS} dl)

2
examples/HelloAria/DebugCallback.cpp → examples/cpp/SampleCpp/DebugCallback.cpp
Просмотреть файл

@ -104,7 +104,7 @@ void MyDebugEventListener::OnDebugEvent(DebugEvent &evt)
case EVT_STORAGE_FULL:
printf("OnStorageFull: seq=%llu, ts=%llu, type=0x%08x, p1=%zu, p2=%zu\n", evt.seq, evt.ts, evt.type, evt.param1, evt.param2);
if (evt.param1 >= 75) {
// UploadNow must NEVER EVER be called from Aria callback thread, so either use this structure below
// UploadNow must NEVER EVER be called from SDK callback thread, so either use this structure below
// or notify the main app that it has to do the profile timers housekeeping / force the upload...
std::thread([]() { LogManager::UploadNow(); }).detach();
}

0
examples/HelloAria/DebugCallback.hpp → examples/cpp/SampleCpp/DebugCallback.hpp
Просмотреть файл

0
examples/HelloAria/HelloAria.vcxproj → examples/cpp/SampleCpp/HelloAria.vcxproj
Просмотреть файл

0
examples/HelloAria/HelloAria.vcxproj.filters → examples/cpp/SampleCpp/HelloAria.vcxproj.filters
Просмотреть файл

4
examples/HelloAria/LogManagerA.hpp → examples/cpp/SampleCpp/LogManagerA.hpp
Просмотреть файл

@ -1,7 +1,7 @@
#pragma once
#include "LogManager.hpp"
namespace ARIASDK_NS_BEGIN {
namespace MAT_NS_BEGIN {
class ModuleA : public ILogConfiguration {};
class LogManagerA : public LogManagerBase<ModuleA> {};
DEFINE_LOGMANAGER(LogManagerA, ModuleA);
} ARIASDK_NS_END
} MAT_NS_END

4
examples/HelloAria/LogManagerB.hpp → examples/cpp/SampleCpp/LogManagerB.hpp
Просмотреть файл

@ -1,7 +1,7 @@
#pragma once
#include "LogManager.hpp"
namespace ARIASDK_NS_BEGIN {
namespace MAT_NS_BEGIN {
class ModuleB : public ILogConfiguration {};
class LogManagerB : public LogManagerBase<ModuleB> {};
DEFINE_LOGMANAGER(LogManagerB, ModuleB);
} ARIASDK_NS_END
} MAT_NS_END

0
examples/HelloAria/OfficeTest.cpp → examples/cpp/SampleCpp/OfficeTest.cpp
Просмотреть файл

0
examples/HelloAria/build.sh → examples/cpp/SampleCpp/build.sh Executable file → Normal file
Просмотреть файл

7
examples/HelloAria/demo.c → examples/cpp/SampleCpp/demo.c
Просмотреть файл

@ -1,6 +1,7 @@
#define _CRT_SECURE_LOG_S /* Replace evt_log by evt_log_s following Secure Template principle */
#include <aria.h>
#include "mat.h"
#include <stdio.h>
#include <stdlib.h>
#include <CommonFields.h>
@ -30,7 +31,7 @@ void test_c_api()
"\"maxTeardownUploadTimeInSec\":5," // Allow up to 5 seconds for upload
"\"hostMode\":false," // Explicitly declare yourself as guest
"\"minimumTraceLevel\":0," // Debug printout level
"\"sdkmode\":0" // Aria direct-upload mode
"\"sdkmode\":0" // SDK direct-upload mode
"}";
evt_handle_t handle = evt_open(config);
#endif
@ -55,7 +56,7 @@ void test_c_api()
PII_STR("piiKey", "secret", 1), // TODO: copy-paste-translate the Pii Kind enum from C++ to C
// Part "X" demo - populating CS extension props
// Common Data Extensions.App
PII_STR("ext.app.userId", "maxgolov@microsoft.com", 1),
PII_STR("ext.app.userId", "jackfrost@microsoft.com", 1),
_STR("ext.app.ver", "1.0.0")
);

0
examples/HelloAria/deploy-dll.cmd → examples/cpp/SampleCpp/deploy-dll.cmd
Просмотреть файл

2
examples/HelloAria/guest.cpp → examples/cpp/SampleCpp/guest.cpp
Просмотреть файл

@ -1,4 +1,4 @@
// This is an example that shows how ato utilize Aria SDK "Guest" mode.
// This is an example that shows how ato utilize SDK "Guest" mode.
// SDK running in Guest mode cannot utilize the LogController methods.
//// This define below illustrates how to enforce the compile-time method availability check

41
examples/HelloAria/main.cpp → examples/cpp/SampleCpp/main.cpp
Просмотреть файл

@ -162,6 +162,43 @@ ILogConfiguration testConfiguration()
extern "C" int OfficeTest();
extern "C" void test_c_api();
void logPiiEvent()
{
auto logger = LogManager::GetLogger();
// Log detailed event with various properties
EventProperties detailed_event("detailed_event",
{
// Log compiler version
{ "_MSC_VER", _MSC_VER },
// Pii-typed fields
{ "piiKind.None", EventProperty("field_value", PiiKind_None) },
{ "piiKind.DistinguishedName", EventProperty("/CN=Jack Frost,OU=PIE,DC=REDMOND,DC=COM", PiiKind_DistinguishedName) },
{ "piiKind.GenericData", EventProperty("generic_data", PiiKind_GenericData) },
{ "piiKind.IPv4Address", EventProperty("127.0.0.1", PiiKind_IPv4Address) },
{ "piiKind.IPv6Address", EventProperty("2001:0db8:85a3:0000:0000:8a2e:0370:7334", PiiKind_IPv6Address) },
{ "piiKind.MailSubject", EventProperty("RE: test", PiiKind_MailSubject) },
{ "piiKind.PhoneNumber", EventProperty("+1-425-829-5875", PiiKind_PhoneNumber) },
{ "piiKind.QueryString", EventProperty("a=1&b=2&c=3", PiiKind_QueryString) },
{ "piiKind.SipAddress", EventProperty("sip:info@microsoft.com", PiiKind_SipAddress) },
{ "piiKind.SmtpAddress", EventProperty("Jack Frost <jackfrost@fabrikam.com>", PiiKind_SmtpAddress) },
{ "piiKind.Identity", EventProperty("Jack Frost", PiiKind_Identity) },
{ "piiKind.Uri", EventProperty("http://www.microsoft.com", PiiKind_Uri) },
{ "piiKind.Fqdn", EventProperty("www.microsoft.com", PiiKind_Fqdn) },
// Various typed key-values
{ "strKey1", "hello1" },
{ "strKey2", "hello2" },
{ "int64Key", 1L },
{ "dblKey", 3.14 },
{ "boolKey", false },
{ "guidKey0", GUID_t("00000000-0000-0000-0000-000000000000") },
{ "guidKey1", GUID_t("00010203-0405-0607-0809-0A0B0C0D0E0F") },
{ "guidKey2", GUID_t("00010203-0405-0607-0809-0A0B0C0D0E0F") },
{ "timeKey1", time_ticks_t((uint64_t)0) }, // time in .NET ticks
});
logger->LogEvent(detailed_event);
}
int main()
{
#ifdef OFFICE_TEST /* Custom test for a stats crash scenario experienced by OTEL */
@ -192,7 +229,7 @@ int main()
config[CFG_INT_TRACE_LEVEL_MASK] = 0; // 0xFFFFFFFF ^ 128;
config[CFG_INT_TRACE_LEVEL_MIN] = ACTTraceLevel_Warn; // ACTTraceLevel_Info; // ACTTraceLevel_Debug;
config[CFG_INT_SDK_MODE] = SdkModeTypes::SdkModeTypes_Aria; // SdkModeTypes::SdkModeTypes_UTCCommonSchema
config[CFG_INT_SDK_MODE] = SdkModeTypes::SdkModeTypes_CS; // SdkModeTypes::SdkModeTypes_UTCCommonSchema
config[CFG_INT_MAX_TEARDOWN_TIME] = 10;
#ifdef USE_INVALID_URL /* Stress-test for the case when collector is unreachable */
config[CFG_STR_COLLECTOR_URL] = "https://127.0.0.1/invalid/url";
@ -234,6 +271,8 @@ int main()
semanticContext->SetAppLanguage("en-US"); // caller must obtain this from app manifest, e.g. .plist on Mac OS X
semanticContext->SetUserLanguage("en-US"); // caller must obtain the user language from preferences
logPiiEvent();
Api_v1_CompatChecks();
// Run C API client test

0
examples/HelloAria/run-tests.sh → examples/cpp/SampleCpp/run-tests.sh Executable file → Normal file
Просмотреть файл

0
examples/HelloAriaUWP/App.xaml → examples/cpp/SampleCppUWP/App.xaml
Просмотреть файл

0
examples/HelloAriaUWP/App.xaml.cpp → examples/cpp/SampleCppUWP/App.xaml.cpp
Просмотреть файл

0
Solutions/uap-cpp/App.xaml.h → examples/cpp/SampleCppUWP/App.xaml.h
Просмотреть файл

2
examples/HelloAriaUWP/AriaInstance.cpp → examples/cpp/SampleCppUWP/AriaInstance.cpp
Просмотреть файл

@ -31,7 +31,7 @@ void AriaInitialize()
configuration[CFG_INT_MAX_TEARDOWN_TIME] = 20;
configuration[CFG_INT_TRACE_LEVEL_MASK] = 0xFFFFFFFFF;
configuration[CFG_INT_TRACE_LEVEL_MIN] = ACTTraceLevel_Debug;
configuration[CFG_INT_SDK_MODE] = SdkModeTypes_Aria; /* or UTC mode: SdkModeTypes_UTCAriaBackCompat; */
configuration[CFG_INT_SDK_MODE] = SdkModeTypes_CS; /* or UTC mode: SdkModeTypes_UTCBackCompat; */
ILogger *logger = LogManager::Initialize(TOKEN);
LogManager::GetSemanticContext()->SetAppId("UAPCPP");

0
Solutions/uap-cpp/Assets/Logo.scale-100.png → examples/cpp/SampleCppUWP/Assets/Logo.scale-100.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 801 B

После

Ширина:  |  Высота:  |  Размер: 801 B

0
Solutions/uap-cpp/Assets/SmallLogo.scale-100.png → examples/cpp/SampleCppUWP/Assets/SmallLogo.scale-100.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 1.4 KiB

После

Ширина:  |  Высота:  |  Размер: 1.4 KiB

0
Solutions/uap-cpp/Assets/SplashScreen.scale-100.png → examples/cpp/SampleCppUWP/Assets/SplashScreen.scale-100.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 2.1 KiB

После

Ширина:  |  Высота:  |  Размер: 2.1 KiB

0
Solutions/uap-cpp/Assets/StoreLogo.scale-100.png → examples/cpp/SampleCppUWP/Assets/StoreLogo.scale-100.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 429 B

После

Ширина:  |  Высота:  |  Размер: 429 B

0
Solutions/uap-cpp/Assets/WideLogo.scale-100.png → examples/cpp/SampleCppUWP/Assets/WideLogo.scale-100.png
Просмотреть файл

Режим "рядом" Свайп Оверлей

До

Ширина:  |  Высота:  |  Размер: 2.1 KiB

После

Ширина:  |  Высота:  |  Размер: 2.1 KiB

0
Solutions/uap-cpp/BlankPage.xaml → examples/cpp/SampleCppUWP/BlankPage.xaml
Просмотреть файл

0
Solutions/uap-cpp/BlankPage.xaml.cpp → examples/cpp/SampleCppUWP/BlankPage.xaml.cpp
Просмотреть файл

0
Solutions/uap-cpp/BlankPage.xaml.h → examples/cpp/SampleCppUWP/BlankPage.xaml.h
Просмотреть файл

21
examples/HelloAriaUWP/Main.cpp → examples/cpp/SampleCppUWP/Main.cpp
Просмотреть файл

@ -32,12 +32,9 @@
using namespace MAT;
using namespace std;
// Specify this API token in the SDK initialization call to send data for this application.
// Please keep this token secure if it is for production services.
// https://aria.microsoft.com/developer/start-now/using-aria/send-events
// Windows SDK Test - Prod: Default Ingestion Token.
#define TOKEN "6d084bbf6a9644ef83f40a77c9e34580-c2d379e0-4408-4325-9b4d-2a7d78131e14-7322"
// Windows SDK Test 2 - Int: Default Ingestion Token.
#define TOKEN2 "0ae6cd22d8264818933f4857dd3c1472-eea5f30e-e0ed-4ab0-8ed0-4dc0f5e156e0-7385"
@ -241,17 +238,17 @@ EventProperties CreateSampleEvent(const char *name, EventPriority prio) {
{
{ "_MSC_VER", _MSC_VER },
{ "piiKind.None", EventProperty("maxgolov", PiiKind_None) },
{ "piiKind.DistinguishedName", EventProperty("/CN=Max Golovanov,OU=ARIA,DC=REDMOND,DC=COM", PiiKind_DistinguishedName) },
{ "piiKind.GenericData", EventProperty("maxgolov", PiiKind_GenericData) },
{ "piiKind.None", EventProperty("jackfrost", PiiKind_None) },
{ "piiKind.DistinguishedName", EventProperty("/CN=Jack Frost,OU=PIE,DC=REDMOND,DC=COM", PiiKind_DistinguishedName) },
{ "piiKind.GenericData", EventProperty("jackfrost", PiiKind_GenericData) },
{ "piiKind.IPv4Address", EventProperty("127.0.0.1", PiiKind_IPv4Address) },
{ "piiKind.IPv6Address", EventProperty("2001:0db8:85a3:0000:0000:8a2e:0370:7334", PiiKind_IPv6Address) },
{ "piiKind.MailSubject", EventProperty("RE: test", PiiKind_MailSubject) },
{ "piiKind.PhoneNumber", EventProperty("+1-613-866-6960", PiiKind_PhoneNumber) },
{ "piiKind.QueryString", EventProperty("a=1&b=2&c=3", PiiKind_QueryString) },
{ "piiKind.SipAddress", EventProperty("sip:maxgolov@microsoft.com", PiiKind_SipAddress) },
{ "piiKind.SmtpAddress", EventProperty("Max Golovanov <maxgolov@microsoft.com>", PiiKind_SmtpAddress) },
{ "piiKind.Identity", EventProperty("Max Golovanov", PiiKind_Identity) },
{ "piiKind.SipAddress", EventProperty("sip:jackfrost@microsoft.com", PiiKind_SipAddress) },
{ "piiKind.SmtpAddress", EventProperty("Jack Frost <jackfrost@microsoft.com>", PiiKind_SmtpAddress) },
{ "piiKind.Identity", EventProperty("Jack Frost", PiiKind_Identity) },
{ "piiKind.Uri", EventProperty("http://www.microsoft.com", PiiKind_Uri) },
{ "piiKind.Fqdn", EventProperty("www.microsoft.com", PiiKind_Fqdn) },
@ -337,7 +334,7 @@ ILogger* init() {
configuration[CFG_INT_CACHE_FILE_SIZE] = 50000000;
configuration[CFG_INT_RAM_QUEUE_SIZE] = 2000000;
configuration[CFG_INT_MAX_TEARDOWN_TIME] = 2;
configuration[CFG_INT_SDK_MODE] = SdkModeTypes_Aria; /* or UTC mode: SdkModeTypes_UTCAriaBackCompat; */
configuration[CFG_INT_SDK_MODE] = SdkModeTypes_CS; /* or UTC mode: SdkModeTypes_UTCBackCompat; */
// OTEL profile example
const char* transmitProfileDefinitions = R"(
@ -411,7 +408,7 @@ void run(ILogger* logger, int maxStressRuns) {
{
// Set the custom context to be sent with every telemetry event.
logger->SetContext("TeamName", "ARIA");
logger->SetContext("TeamName", "PIE");
logger->SetContext("AppID", VER1 VER2 "-" __DATE__ " " __TIME__);
// Set the semantic context. For example, an app will set this property after the user logs in.
logger->GetSemanticContext()->SetUserMsaId("BCCA864D-1386-4D5A-9570-B129F6DD42B7");

0
examples/HelloAriaUWP/Main.hpp → examples/cpp/SampleCppUWP/Main.hpp
Просмотреть файл

0
examples/HelloAriaUWP/MainPage.xaml → examples/cpp/SampleCppUWP/MainPage.xaml
Просмотреть файл

12
examples/HelloAriaUWP/MainPage.xaml.cpp → examples/cpp/SampleCppUWP/MainPage.xaml.cpp
Просмотреть файл

@ -113,17 +113,17 @@ void MainPage::SimpleTestClick(Platform::Object^ sender, Windows::UI::Xaml::Rout
{
{ "_MSC_VER", _MSC_VER },
{ "piiKind.None", EventProperty("maxgolov", PiiKind_None) },
{ "piiKind.DistinguishedName", EventProperty("/CN=Max Golovanov,OU=ARIA,DC=REDMOND,DC=COM", PiiKind_DistinguishedName) },
{ "piiKind.GenericData", EventProperty("maxgolov", PiiKind_GenericData) },
{ "piiKind.None", EventProperty("jackfrost", PiiKind_None) },
{ "piiKind.DistinguishedName", EventProperty("/CN=Jack Frost,OU=PIE,DC=REDMOND,DC=COM", PiiKind_DistinguishedName) },
{ "piiKind.GenericData", EventProperty("jackfrost", PiiKind_GenericData) },
{ "piiKind.IPv4Address", EventProperty("127.0.0.1", PiiKind_IPv4Address) },
{ "piiKind.IPv6Address", EventProperty("2001:0db8:85a3:0000:0000:8a2e:0370:7334", PiiKind_IPv6Address) },
{ "piiKind.MailSubject", EventProperty("RE: test", PiiKind_MailSubject) },
{ "piiKind.PhoneNumber", EventProperty("+1-613-866-6960", PiiKind_PhoneNumber) },
{ "piiKind.QueryString", EventProperty("a=1&b=2&c=3", PiiKind_QueryString) },
{ "piiKind.SipAddress", EventProperty("sip:maxgolov@microsoft.com", PiiKind_SipAddress) },
{ "piiKind.SmtpAddress", EventProperty("Max Golovanov <maxgolov@microsoft.com>", PiiKind_SmtpAddress) },
{ "piiKind.Identity", EventProperty("Max Golovanov", PiiKind_Identity) },
{ "piiKind.SipAddress", EventProperty("sip:jackfrost@microsoft.com", PiiKind_SipAddress) },
{ "piiKind.SmtpAddress", EventProperty("Jack Frost <jackfrost@microsoft.com>", PiiKind_SmtpAddress) },
{ "piiKind.Identity", EventProperty("Jack Frost", PiiKind_Identity) },
{ "piiKind.Uri", EventProperty("http://www.microsoft.com", PiiKind_Uri) },
{ "piiKind.Fqdn", EventProperty("www.microsoft.com", PiiKind_Fqdn) },

0
examples/HelloAriaUWP/MainPage.xaml.h → examples/cpp/SampleCppUWP/MainPage.xaml.h
Просмотреть файл

0
Solutions/uap-cpp/Package.appxmanifest → examples/cpp/SampleCppUWP/Package.appxmanifest
Просмотреть файл

0
examples/ExpClientCS/TemporaryKey.pfx → examples/cpp/SampleCppUWP/TemporaryKey.pfx
Просмотреть файл

0
examples/HelloAriaUWP/UAPCPP.vcxproj → examples/cpp/SampleCppUWP/UAPCPP.vcxproj
Просмотреть файл

0
examples/HelloAriaUWP/UAPCPP.vcxproj.filters → examples/cpp/SampleCppUWP/UAPCPP.vcxproj.filters
Просмотреть файл

0
examples/ExpClientCppUWP/Utils.hpp → examples/cpp/SampleCppUWP/Utils.hpp
Просмотреть файл

0
examples/HelloAriaCS/packages.config → examples/cpp/SampleCppUWP/packages.config
Просмотреть файл

Некоторые файлы не были показаны из-за слишком большого количества измененных файлов Показать больше