diff options
| author | Rob Mensching <rob@firegiant.com> | 2018-10-03 13:51:56 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2018-10-03 23:53:53 -0700 |
| commit | df46bd7e832cb313ecb43479c4a48670f930f8d4 (patch) | |
| tree | 67dd5d72755aa51e493762c49a138b9264e89bdd /src/wcautil | |
| parent | ce2a0057c5f5ca2068a0376dc2248e131933d1ce (diff) | |
| download | wix-df46bd7e832cb313ecb43479c4a48670f930f8d4.tar.gz wix-df46bd7e832cb313ecb43479c4a48670f930f8d4.tar.bz2 wix-df46bd7e832cb313ecb43479c4a48670f930f8d4.zip | |
Standardize on props with NCrunch support
Diffstat (limited to 'src/wcautil')
| -rw-r--r-- | src/wcautil/wcautil.vcxproj | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/wcautil/wcautil.vcxproj b/src/wcautil/wcautil.vcxproj index 61bd9437..d9356a8e 100644 --- a/src/wcautil/wcautil.vcxproj +++ b/src/wcautil/wcautil.vcxproj | |||
| @@ -29,12 +29,14 @@ | |||
| 29 | <CharacterSet>MultiByte</CharacterSet> | 29 | <CharacterSet>MultiByte</CharacterSet> |
| 30 | <Description>WiX Toolset Custom Action native utility library</Description> | 30 | <Description>WiX Toolset Custom Action native utility library</Description> |
| 31 | </PropertyGroup> | 31 | </PropertyGroup> |
| 32 | |||
| 32 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 33 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 33 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 34 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 34 | <ImportGroup Label="Shared"> | 35 | <ImportGroup Label="Shared"> |
| 35 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets')" /> | 36 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.0.37-beta\build\Nerdbank.GitVersioning.targets')" /> |
| 36 | </ImportGroup> | 37 | </ImportGroup> |
| 37 | <Import Project="..\NativeMultiTargeting.Build.props" /> | 38 | <Import Project="..\NativeMultiTargeting.Build.props" /> |
| 39 | |||
| 38 | <ItemGroup> | 40 | <ItemGroup> |
| 39 | <ClCompile Include="exbinary.cpp" /> | 41 | <ClCompile Include="exbinary.cpp" /> |
| 40 | <ClCompile Include="wcalog.cpp" /> | 42 | <ClCompile Include="wcalog.cpp" /> |
| @@ -47,6 +49,7 @@ | |||
| 47 | <ClCompile Include="wcawrap.cpp" /> | 49 | <ClCompile Include="wcawrap.cpp" /> |
| 48 | <ClCompile Include="qtexec.cpp" /> | 50 | <ClCompile Include="qtexec.cpp" /> |
| 49 | </ItemGroup> | 51 | </ItemGroup> |
| 52 | |||
| 50 | <ItemGroup Condition="'$(Platform)' == 'Win32'"> | 53 | <ItemGroup Condition="'$(Platform)' == 'Win32'"> |
| 51 | <ClInclude Include="custommsierrors.h"> | 54 | <ClInclude Include="custommsierrors.h"> |
| 52 | <GenerateWixInclude>caerr.wxi</GenerateWixInclude> | 55 | <GenerateWixInclude>caerr.wxi</GenerateWixInclude> |
| @@ -62,12 +65,16 @@ | |||
| 62 | <ClInclude Include="inc\wcawow64.h" /> | 65 | <ClInclude Include="inc\wcawow64.h" /> |
| 63 | <ClInclude Include="inc\wcawrapquery.h" /> | 66 | <ClInclude Include="inc\wcawrapquery.h" /> |
| 64 | </ItemGroup> | 67 | </ItemGroup> |
| 68 | |||
| 65 | <ItemGroup> | 69 | <ItemGroup> |
| 66 | <None Include="packages.config" /> | 70 | <None Include="packages.config" /> |
| 67 | </ItemGroup> | 71 | </ItemGroup> |
| 68 | <Target Name="PackNativeNuget" DependsOnTargets="GetBuildVersion"> | 72 | |
| 69 | <Exec Command="nuget pack wcautil.nuspec -OutputDirectory $(BaseOutputPath) -Properties Configuration=$(Configuration);Id=WixToolset.WcaUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"" /> | 73 | <Target Name="PackNativeNuget" |
| 74 | DependsOnTargets="GetBuildVersion"> | ||
| 75 | <Exec Command='nuget pack wcautil.nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=WixToolset.WcaUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' /> | ||
| 70 | </Target> | 76 | </Target> |
| 77 | |||
| 71 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 78 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 72 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 79 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
| 73 | <PropertyGroup> | 80 | <PropertyGroup> |