diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-07-04 18:59:34 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-07-04 19:01:59 -0400 |
| commit | 6d17a027ff6155ed50f78858cad17d1baef9856d (patch) | |
| tree | 446d5f4730ef61703f19aa3bd4ee20e6e767c795 /src/ca | |
| parent | 4e1ad5e7a257b351d40a8d68aa6e1a961766556b (diff) | |
| download | wix-6d17a027ff6155ed50f78858cad17d1baef9856d.tar.gz wix-6d17a027ff6155ed50f78858cad17d1baef9856d.tar.bz2 wix-6d17a027ff6155ed50f78858cad17d1baef9856d.zip | |
Add per-platform custom action support.
Diffstat (limited to 'src/ca')
| -rw-r--r-- | src/ca/dependencyca.vcxproj | 39 | ||||
| -rw-r--r-- | src/ca/dependencyca.vcxproj.filters | 1 |
2 files changed, 28 insertions, 12 deletions
diff --git a/src/ca/dependencyca.vcxproj b/src/ca/dependencyca.vcxproj index d8441f14..c1dfc0c0 100644 --- a/src/ca/dependencyca.vcxproj +++ b/src/ca/dependencyca.vcxproj | |||
| @@ -1,10 +1,8 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> | 2 | <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. --> |
| 3 | |||
| 4 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> |
| 6 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" /> |
| 7 | |||
| 8 | <ItemGroup Label="ProjectConfigurations"> | 6 | <ItemGroup Label="ProjectConfigurations"> |
| 9 | <ProjectConfiguration Include="Debug|Win32"> | 7 | <ProjectConfiguration Include="Debug|Win32"> |
| 10 | <Configuration>Debug</Configuration> | 8 | <Configuration>Debug</Configuration> |
| @@ -14,43 +12,60 @@ | |||
| 14 | <Configuration>Release</Configuration> | 12 | <Configuration>Release</Configuration> |
| 15 | <Platform>Win32</Platform> | 13 | <Platform>Win32</Platform> |
| 16 | </ProjectConfiguration> | 14 | </ProjectConfiguration> |
| 15 | <ProjectConfiguration Include="Debug|x64"> | ||
| 16 | <Configuration>Debug</Configuration> | ||
| 17 | <Platform>x64</Platform> | ||
| 18 | </ProjectConfiguration> | ||
| 19 | <ProjectConfiguration Include="Release|x64"> | ||
| 20 | <Configuration>Release</Configuration> | ||
| 21 | <Platform>x64</Platform> | ||
| 22 | </ProjectConfiguration> | ||
| 23 | <ProjectConfiguration Include="Debug|ARM"> | ||
| 24 | <Configuration>Debug</Configuration> | ||
| 25 | <Platform>ARM</Platform> | ||
| 26 | </ProjectConfiguration> | ||
| 27 | <ProjectConfiguration Include="Release|ARM"> | ||
| 28 | <Configuration>Release</Configuration> | ||
| 29 | <Platform>ARM</Platform> | ||
| 30 | </ProjectConfiguration> | ||
| 31 | <ProjectConfiguration Include="Debug|ARM64"> | ||
| 32 | <Configuration>Debug</Configuration> | ||
| 33 | <Platform>ARM64</Platform> | ||
| 34 | </ProjectConfiguration> | ||
| 35 | <ProjectConfiguration Include="Release|ARM64"> | ||
| 36 | <Configuration>Release</Configuration> | ||
| 37 | <Platform>ARM64</Platform> | ||
| 38 | </ProjectConfiguration> | ||
| 17 | </ItemGroup> | 39 | </ItemGroup> |
| 18 | |||
| 19 | <PropertyGroup Label="Globals"> | 40 | <PropertyGroup Label="Globals"> |
| 20 | <ProjectGuid>{B86AF46C-0F90-49CC-923F-A800B088D015}</ProjectGuid> | 41 | <ProjectGuid>{B86AF46C-0F90-49CC-923F-A800B088D015}</ProjectGuid> |
| 21 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 42 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| 22 | <PlatformToolset>v141</PlatformToolset> | 43 | <PlatformToolset>v142</PlatformToolset> |
| 23 | <CharacterSet>Unicode</CharacterSet> | 44 | <CharacterSet>Unicode</CharacterSet> |
| 24 | <TargetName>dependencyca</TargetName> | 45 | <TargetName>dependencyca</TargetName> |
| 25 | <ProjectModuleDefinitionFile>wixdepca.def</ProjectModuleDefinitionFile> | 46 | <ProjectModuleDefinitionFile>wixdepca.def</ProjectModuleDefinitionFile> |
| 26 | <Description>WiX Toolset Dependency CustomAction</Description> | 47 | <Description>WiX Toolset Dependency CustomAction</Description> |
| 48 | <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> | ||
| 27 | </PropertyGroup> | 49 | </PropertyGroup> |
| 28 | |||
| 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 50 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 51 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 31 | |||
| 32 | <PropertyGroup> | 52 | <PropertyGroup> |
| 33 | <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries> | 53 | <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries> |
| 34 | </PropertyGroup> | 54 | </PropertyGroup> |
| 35 | |||
| 36 | <ItemGroup> | 55 | <ItemGroup> |
| 37 | <ClCompile Include="dllmain.cpp"> | 56 | <ClCompile Include="dllmain.cpp"> |
| 38 | <PrecompiledHeader>Create</PrecompiledHeader> | 57 | <PrecompiledHeader>Create</PrecompiledHeader> |
| 39 | </ClCompile> | 58 | </ClCompile> |
| 40 | <ClCompile Include="wixdepca.cpp" /> | 59 | <ClCompile Include="wixdepca.cpp" /> |
| 41 | </ItemGroup> | 60 | </ItemGroup> |
| 42 | |||
| 43 | <ItemGroup> | 61 | <ItemGroup> |
| 44 | <ClInclude Include="precomp.h" /> | 62 | <ClInclude Include="precomp.h" /> |
| 45 | </ItemGroup> | 63 | </ItemGroup> |
| 46 | |||
| 47 | <ItemGroup> | 64 | <ItemGroup> |
| 48 | <None Include="packages.config" /> | 65 | <None Include="packages.config" /> |
| 49 | <None Include="wixdepca.def" /> | 66 | <None Include="wixdepca.def" /> |
| 50 | </ItemGroup> | 67 | </ItemGroup> |
| 51 | |||
| 52 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 68 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 53 | |||
| 54 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 69 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
| 55 | <PropertyGroup> | 70 | <PropertyGroup> |
| 56 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> | 71 | <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> |
| @@ -58,4 +73,4 @@ | |||
| 58 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> | 73 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> |
| 59 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" /> | 74 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.16\build\WixToolset.WcaUtil.props'))" /> |
| 60 | </Target> | 75 | </Target> |
| 61 | </Project> | 76 | </Project> \ No newline at end of file |
diff --git a/src/ca/dependencyca.vcxproj.filters b/src/ca/dependencyca.vcxproj.filters index d4931f32..bfe457e2 100644 --- a/src/ca/dependencyca.vcxproj.filters +++ b/src/ca/dependencyca.vcxproj.filters | |||
| @@ -31,5 +31,6 @@ | |||
| 31 | <None Include="wixdepca.def"> | 31 | <None Include="wixdepca.def"> |
| 32 | <Filter>Source Files</Filter> | 32 | <Filter>Source Files</Filter> |
| 33 | </None> | 33 | </None> |
| 34 | <None Include="packages.config" /> | ||
| 34 | </ItemGroup> | 35 | </ItemGroup> |
| 35 | </Project> \ No newline at end of file | 36 | </Project> \ No newline at end of file |
