summaryrefslogtreecommitdiff
path: root/src/Directory.vcxproj.props
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2021-04-16 23:35:06 -0700
committerRob Mensching <rob@firegiant.com>2021-04-29 16:47:06 -0700
commita2f0de28fc0f1ab71d4685c77f0b21d946f3e702 (patch)
tree585a60388d844515a21b5d8a786e5f91ff227127 /src/Directory.vcxproj.props
parentae224f38e8349e2d0dfce95918571db4f18b5fba (diff)
downloadwix-a2f0de28fc0f1ab71d4685c77f0b21d946f3e702.tar.gz
wix-a2f0de28fc0f1ab71d4685c77f0b21d946f3e702.tar.bz2
wix-a2f0de28fc0f1ab71d4685c77f0b21d946f3e702.zip
Introduce new versioning system based on GitInfo
Diffstat (limited to 'src/Directory.vcxproj.props')
-rw-r--r--src/Directory.vcxproj.props9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/Directory.vcxproj.props b/src/Directory.vcxproj.props
index bcf26c57..63d73b36 100644
--- a/src/Directory.vcxproj.props
+++ b/src/Directory.vcxproj.props
@@ -19,17 +19,22 @@
19 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion> 19 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>
20 </PropertyGroup> 20 </PropertyGroup>
21 21
22 <PropertyGroup>
23 <CodeAnalysisRuleSet Condition=" Exists('$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset') ">$(MSBuildThisFileDirectory)CustomizedNativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
24 </PropertyGroup>
25
22 <ItemDefinitionGroup> 26 <ItemDefinitionGroup>
23 <ClCompile> 27 <ClCompile>
24 <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings> 28 <DisableSpecificWarnings>$(DisableSpecificCompilerWarnings)</DisableSpecificWarnings>
25 <WarningLevel>Level4</WarningLevel> 29 <WarningLevel>Level4</WarningLevel>
26 <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> 30 <AdditionalIncludeDirectories>$(ProjectDir)inc;$(MSBuildProjectDirectory);$(IntDir);$(SqlCESdkIncludePath);$(ProjectAdditionalIncludeDirectories);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
27 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0501;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> 31 <PreprocessorDefinitions>WIN32;_WINDOWS;_WIN32_MSI=500;_WIN32_WINNT=0x0600;$(ArmPreprocessorDefinitions);$(UnicodePreprocessorDefinitions);_CRT_STDIO_LEGACY_WIDE_SPECIFIERS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
28 <PrecompiledHeader>Use</PrecompiledHeader> 32 <PrecompiledHeader>Use</PrecompiledHeader>
29 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile> 33 <PrecompiledHeaderFile>precomp.h</PrecompiledHeaderFile>
30 <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention> 34 <CallingConvention Condition="'$(Platform)'=='Win32'">StdCall</CallingConvention>
31 <TreatWarningAsError>true</TreatWarningAsError> 35 <TreatWarningAsError>true</TreatWarningAsError>
32 <ExceptionHandling>false</ExceptionHandling> 36 <ExceptionHandling>false</ExceptionHandling>
37 <ControlFlowGuard>Guard</ControlFlowGuard>
33 <AdditionalOptions>-YlprecompDefine</AdditionalOptions> 38 <AdditionalOptions>-YlprecompDefine</AdditionalOptions>
34 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions> 39 <AdditionalOptions Condition=" $(PlatformToolset.StartsWith('v14')) ">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
35 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation> 40 <MultiProcessorCompilation Condition=" $(NUMBER_OF_PROCESSORS) &gt; 4 ">true</MultiProcessorCompilation>
@@ -79,6 +84,7 @@
79 </ItemDefinitionGroup> 84 </ItemDefinitionGroup>
80 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' "> 85 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Debug' and '$(CLRSupport)'=='true' ">
81 <ClCompile> 86 <ClCompile>
87 <ControlFlowGuard></ControlFlowGuard>
82 <BasicRuntimeChecks></BasicRuntimeChecks> 88 <BasicRuntimeChecks></BasicRuntimeChecks>
83 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary> 89 <RuntimeLibrary>MultiThreadedDebugDll</RuntimeLibrary>
84 </ClCompile> 90 </ClCompile>
@@ -98,6 +104,7 @@
98 </ItemDefinitionGroup> 104 </ItemDefinitionGroup>
99 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' "> 105 <ItemDefinitionGroup Condition=" '$(Configuration)'=='Release' and '$(CLRSupport)'=='true' ">
100 <ClCompile> 106 <ClCompile>
107 <ControlFlowGuard></ControlFlowGuard>
101 <BasicRuntimeChecks></BasicRuntimeChecks> 108 <BasicRuntimeChecks></BasicRuntimeChecks>
102 <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary> 109 <RuntimeLibrary>MultiThreadedDll</RuntimeLibrary>
103 </ClCompile> 110 </ClCompile>