aboutsummaryrefslogtreecommitdiff
path: root/src/ca
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2019-02-03 14:43:56 -0600
committerSean Hall <r.sean.hall@gmail.com>2019-02-03 14:49:25 -0600
commit6f29d2fc2b3514cc85a7975e974e8e31f39288e2 (patch)
treeea93f131bdaef7c052cf9d3a855731d516c281ea /src/ca
parent72f3dceefa2e3893b061e074380794bc60b67b6f (diff)
downloadwix-6f29d2fc2b3514cc85a7975e974e8e31f39288e2.tar.gz
wix-6f29d2fc2b3514cc85a7975e974e8e31f39288e2.tar.bz2
wix-6f29d2fc2b3514cc85a7975e974e8e31f39288e2.zip
Integrate into latest v4.
Diffstat (limited to 'src/ca')
-rw-r--r--src/ca/custommsierrors.h5
-rw-r--r--src/ca/dependencyca.vcxproj61
-rw-r--r--src/ca/dependencyca.vcxproj.filters (renamed from src/ca/wixdepca.vcxproj.filters)5
-rw-r--r--src/ca/packages.config5
-rw-r--r--src/ca/wixdepca.def2
-rw-r--r--src/ca/wixdepca.vcxproj57
6 files changed, 72 insertions, 63 deletions
diff --git a/src/ca/custommsierrors.h b/src/ca/custommsierrors.h
new file mode 100644
index 00000000..26450452
--- /dev/null
+++ b/src/ca/custommsierrors.h
@@ -0,0 +1,5 @@
1#pragma once
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#define msierrDependencyMissingDependencies 26451
5#define msierrDependencyHasDependents 26452
diff --git a/src/ca/dependencyca.vcxproj b/src/ca/dependencyca.vcxproj
new file mode 100644
index 00000000..480a1861
--- /dev/null
+++ b/src/ca/dependencyca.vcxproj
@@ -0,0 +1,61 @@
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. -->
3
4<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <Import Project="..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" />
6 <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" />
7
8 <ItemGroup Label="ProjectConfigurations">
9 <ProjectConfiguration Include="Debug|Win32">
10 <Configuration>Debug</Configuration>
11 <Platform>Win32</Platform>
12 </ProjectConfiguration>
13 <ProjectConfiguration Include="Release|Win32">
14 <Configuration>Release</Configuration>
15 <Platform>Win32</Platform>
16 </ProjectConfiguration>
17 </ItemGroup>
18
19 <PropertyGroup Label="Globals">
20 <ProjectGuid>{B86AF46C-0F90-49CC-923F-A800B088D015}</ProjectGuid>
21 <ConfigurationType>DynamicLibrary</ConfigurationType>
22 <PlatformToolset>v141</PlatformToolset>
23 <CharacterSet>Unicode</CharacterSet>
24 <TargetName>dependencyca</TargetName>
25 <ProjectModuleDefinitionFile>wixdepca.def</ProjectModuleDefinitionFile>
26 <Description>WiX Toolset Dependency CustomAction</Description>
27 </PropertyGroup>
28
29 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
30 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31
32 <PropertyGroup>
33 <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
34 </PropertyGroup>
35
36 <ItemGroup>
37 <ClCompile Include="dllmain.cpp">
38 <PrecompiledHeader>Create</PrecompiledHeader>
39 </ClCompile>
40 <ClCompile Include="wixdepca.cpp" />
41 </ItemGroup>
42
43 <ItemGroup>
44 <ClInclude Include="precomp.h" />
45 </ItemGroup>
46
47 <ItemGroup>
48 <None Include="packages.config" />
49 <None Include="wixdepca.def" />
50 </ItemGroup>
51
52 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
53
54 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
55 <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>
57 </PropertyGroup>
58 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props'))" />
59 <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props'))" />
60 </Target>
61</Project>
diff --git a/src/ca/wixdepca.vcxproj.filters b/src/ca/dependencyca.vcxproj.filters
index 1fdb0236..d4931f32 100644
--- a/src/ca/wixdepca.vcxproj.filters
+++ b/src/ca/dependencyca.vcxproj.filters
@@ -28,11 +28,6 @@
28 </ClInclude> 28 </ClInclude>
29 </ItemGroup> 29 </ItemGroup>
30 <ItemGroup> 30 <ItemGroup>
31 <ResourceCompile Include="wixdepca.rc">
32 <Filter>Resource Files</Filter>
33 </ResourceCompile>
34 </ItemGroup>
35 <ItemGroup>
36 <None Include="wixdepca.def"> 31 <None Include="wixdepca.def">
37 <Filter>Source Files</Filter> 32 <Filter>Source Files</Filter>
38 </None> 33 </None>
diff --git a/src/ca/packages.config b/src/ca/packages.config
new file mode 100644
index 00000000..ab964d2c
--- /dev/null
+++ b/src/ca/packages.config
@@ -0,0 +1,5 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="WixToolset.DUtil" version="4.0.16" targetFramework="native" />
4 <package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" />
5</packages> \ No newline at end of file
diff --git a/src/ca/wixdepca.def b/src/ca/wixdepca.def
index df50e992..651c6373 100644
--- a/src/ca/wixdepca.def
+++ b/src/ca/wixdepca.def
@@ -1,7 +1,7 @@
1; 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. 1; 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 2
3 3
4LIBRARY "wixdepca" 4LIBRARY "dependencyca"
5 5
6EXPORTS 6EXPORTS
7 WixDependencyRequire 7 WixDependencyRequire
diff --git a/src/ca/wixdepca.vcxproj b/src/ca/wixdepca.vcxproj
deleted file mode 100644
index b757a35f..00000000
--- a/src/ca/wixdepca.vcxproj
+++ /dev/null
@@ -1,57 +0,0 @@
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. -->
3
4
5<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
6 <ItemGroup Label="ProjectConfigurations">
7 <ProjectConfiguration Include="Debug|Win32">
8 <Configuration>Debug</Configuration>
9 <Platform>Win32</Platform>
10 </ProjectConfiguration>
11 <ProjectConfiguration Include="Release|Win32">
12 <Configuration>Release</Configuration>
13 <Platform>Win32</Platform>
14 </ProjectConfiguration>
15 </ItemGroup>
16 <ItemGroup Label="ProjectConfigurations">
17 <ProjectConfiguration Include="Debug|ARM">
18 <Configuration>Debug</Configuration>
19 <Platform>ARM</Platform>
20 </ProjectConfiguration>
21 <ProjectConfiguration Include="Release|ARM">
22 <Configuration>Release</Configuration>
23 <Platform>ARM</Platform>
24 </ProjectConfiguration>
25 </ItemGroup>
26
27 <PropertyGroup Label="Globals">
28 <ProjectGuid>{B86AF46C-0F90-49CC-923F-A800B088D015}</ProjectGuid>
29 <ConfigurationType>DynamicLibrary</ConfigurationType>
30 <CharacterSet>Unicode</CharacterSet>
31 <TargetName>WixDepCA</TargetName>
32 <ProjectModuleDefinitionFile>wixdepca.def</ProjectModuleDefinitionFile>
33 </PropertyGroup>
34
35 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.props" />
36
37 <PropertyGroup>
38 <ProjectAdditionalIncludeDirectories>$(WixRoot)src\libs\dutil\inc;$(WixRoot)src\libs\wcautil;$(WixRoot)src\libs\deputil\inc</ProjectAdditionalIncludeDirectories>
39 <ProjectAdditionalLinkLibraries>msi.lib;dutil.lib;deputil.lib;wcautil.lib</ProjectAdditionalLinkLibraries>
40 </PropertyGroup>
41
42 <ItemGroup>
43 <ClCompile Include="dllmain.cpp" />
44 <ClCompile Include="wixdepca.cpp" />
45 </ItemGroup>
46 <ItemGroup>
47 <ClInclude Include="precomp.h" />
48 </ItemGroup>
49 <ItemGroup>
50 <None Include="wixdepca.def" />
51 </ItemGroup>
52 <ItemGroup>
53 <ResourceCompile Include="wixdepca.rc" />
54 </ItemGroup>
55
56 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
57</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-24 03:28:41 +0000