Merge branch 'master' into maxgolov/msasg_to_github_plus_new_threading
This commit is contained in:
Коммит
58735b4dd7
|
@ -1,2 +1,92 @@
|
|||
*.cmd text eol=crlf
|
||||
*.sh text eol=lf
|
||||
##### Source code #####
|
||||
|
||||
## C++ and C source files
|
||||
*.c text diff=cpp
|
||||
*.h text diff=cpp
|
||||
*.cpp text diff=cpp
|
||||
*.cxx text diff=cpp
|
||||
*.hpp text diff=cpp
|
||||
|
||||
## Python scripts
|
||||
*.py text eol=lf diff=python
|
||||
|
||||
## Perl scripts/libraries/modules
|
||||
*.perl text eol=lf diff=perl
|
||||
*.pl text eol=lf diff=perl
|
||||
*.pm text eol=lf diff=perl
|
||||
|
||||
## Shell scripts
|
||||
*.sh text eol=lf
|
||||
*.bash text eol=lf
|
||||
|
||||
## Windows batch and PowerShell scripts
|
||||
*.bat text eol=crlf
|
||||
*.cmd text eol=crlf
|
||||
*.ps1 text eol=crlf
|
||||
|
||||
##### Other file types #####
|
||||
|
||||
## Text files and documentation
|
||||
*.txt text
|
||||
README* text
|
||||
INSTALL* text
|
||||
LICENSE* text
|
||||
|
||||
## Non-text documentation
|
||||
*.html text diff=html
|
||||
*.pdf binary
|
||||
*.rtf binary
|
||||
|
||||
## Doxygen documentation configuration files
|
||||
Doxyfile text
|
||||
*.dox text
|
||||
|
||||
## Image files
|
||||
*.png binary
|
||||
*.PNG binary
|
||||
*.jpg binary
|
||||
*.JPG binary
|
||||
*.gif binary
|
||||
*.GIF binary
|
||||
*.bmp binary
|
||||
*.BMP binary
|
||||
*.ico binary
|
||||
*.ICO binary
|
||||
*.ppm binary
|
||||
*.pgm binary
|
||||
*.pbm binary
|
||||
*.xpm -text diff -merge
|
||||
|
||||
## Vector graphics
|
||||
*.svg -text diff -merge
|
||||
|
||||
## CMake files
|
||||
CMakeLists.txt text eol=lf
|
||||
|
||||
## Makefiles
|
||||
Makefile text
|
||||
makefile text
|
||||
GNUmakefile text
|
||||
*.mk text
|
||||
|
||||
## Various IDE project files, etc
|
||||
*.sln -text diff merge
|
||||
*.vcxproj -text diff -merge
|
||||
*.vcxproj.filters -text diff -merge
|
||||
*.props -text diff -merge
|
||||
*.pbxproj -text diff -merge
|
||||
|
||||
## Resource files and UI design descriptions
|
||||
*.rc text
|
||||
|
||||
## Diff/patch files
|
||||
*.diff text diff -merge
|
||||
*.patch text diff -merge
|
||||
|
||||
## XML and configuration
|
||||
*.xml text
|
||||
*.cfg text
|
||||
|
||||
## Self-reference =)
|
||||
.gitignore text
|
||||
.gitattributes text
|
||||
|
|
|
@ -2,4 +2,4 @@
|
|||
# This file controls who is tagged for review for any given pull request.
|
||||
|
||||
# For anything not explicitly taken by someone else:
|
||||
* @maxgolov @reyang
|
||||
* @maxgolov @mkoscumb @reyang
|
||||
|
|
Двоичные данные
examples/cpp/EventSender/EventSender.cpp
Двоичные данные
examples/cpp/EventSender/EventSender.cpp
Двоичный файл не отображается.
|
@ -97,7 +97,7 @@
|
|||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)lib\$(TargetedSDKConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)lib\$(ConfigurationName)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>ClientTelemetry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
|
@ -123,7 +123,7 @@
|
|||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)lib\$(TargetedSDKConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)lib\$(ConfigurationName)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>ClientTelemetry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
|
@ -153,7 +153,7 @@
|
|||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)lib\$(TargetedSDKConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)lib\$(ConfigurationName)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>ClientTelemetry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
|
@ -161,7 +161,7 @@
|
|||
</Command>
|
||||
</PostBuildEvent>
|
||||
<PreBuildEvent>
|
||||
<Command>deploy-dll.cmd $(TargetedSDKConfiguration) $(Platform) $(OutDir)</Command>
|
||||
<Command>deploy-dll.cmd $(ConfigurationName) $(Platform) $(OutDir)</Command>
|
||||
</PreBuildEvent>
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
|
@ -183,7 +183,7 @@
|
|||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)lib\$(TargetedSDKConfiguration)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalLibraryDirectories>$(ProjectDir)lib\$(ConfigurationName)\$(Platform);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<AdditionalDependencies>ClientTelemetry.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
|
|
Загрузка…
Ссылка в новой задаче