aboutsummaryrefslogtreecommitdiff
path: root/src/ca
diff options
context:
space:
mode:
Diffstat (limited to 'src/ca')
-rw-r--r--src/ca/netfxca.vcxproj29
-rw-r--r--src/ca/packages.config5
2 files changed, 17 insertions, 17 deletions
diff --git a/src/ca/netfxca.vcxproj b/src/ca/netfxca.vcxproj
index 2f91eba3..f01417b6 100644
--- a/src/ca/netfxca.vcxproj
+++ b/src/ca/netfxca.vcxproj
@@ -1,8 +1,7 @@
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<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 3
4 <Import Project="..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" /> 4<Project DefaultTargets="Build" ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" />
6 <ItemGroup Label="ProjectConfigurations"> 5 <ItemGroup Label="ProjectConfigurations">
7 <ProjectConfiguration Include="Debug|Win32"> 6 <ProjectConfiguration Include="Debug|Win32">
8 <Configuration>Debug</Configuration> 7 <Configuration>Debug</Configuration>
@@ -29,6 +28,7 @@
29 <Platform>ARM64</Platform> 28 <Platform>ARM64</Platform>
30 </ProjectConfiguration> 29 </ProjectConfiguration>
31 </ItemGroup> 30 </ItemGroup>
31
32 <PropertyGroup Label="Globals"> 32 <PropertyGroup Label="Globals">
33 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> 33 <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
34 <ConfigurationType>DynamicLibrary</ConfigurationType> 34 <ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -38,31 +38,36 @@
38 <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile> 38 <ProjectModuleDefinitionFile>netfxca.def</ProjectModuleDefinitionFile>
39 <Description>WiX Toolset .NET Framework CustomAction</Description> 39 <Description>WiX Toolset .NET Framework CustomAction</Description>
40 </PropertyGroup> 40 </PropertyGroup>
41
41 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> 42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
42 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> 43 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
44
43 <PropertyGroup> 45 <PropertyGroup>
44 <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries> 46 <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
45 </PropertyGroup> 47 </PropertyGroup>
48
46 <ItemGroup> 49 <ItemGroup>
47 <ClCompile Include="dllmain.cpp"> 50 <ClCompile Include="dllmain.cpp">
48 <PrecompiledHeader>Create</PrecompiledHeader> 51 <PrecompiledHeader>Create</PrecompiledHeader>
49 </ClCompile> 52 </ClCompile>
50 <ClCompile Include="netfxca.cpp" /> 53 <ClCompile Include="netfxca.cpp" />
51 </ItemGroup> 54 </ItemGroup>
55
52 <ItemGroup> 56 <ItemGroup>
53 <ClInclude Include="cost.h" /> 57 <ClInclude Include="cost.h" />
54 <ClInclude Include="precomp.h" /> 58 <ClInclude Include="precomp.h" />
55 </ItemGroup> 59 </ItemGroup>
60
56 <ItemGroup> 61 <ItemGroup>
57 <None Include="netfxca.def" /> 62 <None Include="netfxca.def" />
58 <None Include="packages.config" />
59 </ItemGroup> 63 </ItemGroup>
64
65 <ItemGroup>
66 <PackageReference Include="WixToolset.Dutil" Version="4.0.64" />
67 <PackageReference Include="WixToolset.WcaUtil" Version="4.0.18" />
68 <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
69 <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
70 </ItemGroup>
71
60 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> 72 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
61 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 73</Project>
62 <PropertyGroup>
63 <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>
64 </PropertyGroup>
65 <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.64\build\WixToolset.DUtil.props'))" />
66 <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.18\build\WixToolset.WcaUtil.props'))" />
67 </Target>
68</Project> \ No newline at end of file
diff --git a/src/ca/packages.config b/src/ca/packages.config
deleted file mode 100644
index 8a6eee87..00000000
--- a/src/ca/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<packages>
3 <package id="WixToolset.DUtil" version="4.0.64" targetFramework="native" />
4 <package id="WixToolset.WcaUtil" version="4.0.18" targetFramework="native" />
5</packages> \ No newline at end of file