diff options
Diffstat (limited to 'src/ca')
| -rw-r--r-- | src/ca/fwca.vcxproj | 23 | ||||
| -rw-r--r-- | src/ca/packages.config | 4 |
2 files changed, 8 insertions, 19 deletions
diff --git a/src/ca/fwca.vcxproj b/src/ca/fwca.vcxproj index a933ed06..de77df9b 100644 --- a/src/ca/fwca.vcxproj +++ b/src/ca/fwca.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.6\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.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')" /> | 5 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.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> |
| @@ -15,7 +13,6 @@ | |||
| 15 | <Platform>Win32</Platform> | 13 | <Platform>Win32</Platform> |
| 16 | </ProjectConfiguration> | 14 | </ProjectConfiguration> |
| 17 | </ItemGroup> | 15 | </ItemGroup> |
| 18 | |||
| 19 | <PropertyGroup Label="Globals"> | 16 | <PropertyGroup Label="Globals"> |
| 20 | <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> | 17 | <ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid> |
| 21 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 18 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
| @@ -25,40 +22,32 @@ | |||
| 25 | <ProjectModuleDefinitionFile>fwca.def</ProjectModuleDefinitionFile> | 22 | <ProjectModuleDefinitionFile>fwca.def</ProjectModuleDefinitionFile> |
| 26 | <Description>WiX Toolset Firewall CustomAction</Description> | 23 | <Description>WiX Toolset Firewall CustomAction</Description> |
| 27 | </PropertyGroup> | 24 | </PropertyGroup> |
| 28 | |||
| 29 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | 25 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> |
| 30 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | 26 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> |
| 31 | |||
| 32 | <PropertyGroup> | 27 | <PropertyGroup> |
| 33 | <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries> | 28 | <ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries> |
| 34 | </PropertyGroup> | 29 | </PropertyGroup> |
| 35 | |||
| 36 | <ItemGroup> | 30 | <ItemGroup> |
| 37 | <ClCompile Include="dllmain.cpp"> | 31 | <ClCompile Include="dllmain.cpp"> |
| 38 | <PrecompiledHeader>Create</PrecompiledHeader> | 32 | <PrecompiledHeader>Create</PrecompiledHeader> |
| 39 | </ClCompile> | 33 | </ClCompile> |
| 40 | <ClCompile Include="firewall.cpp" /> | 34 | <ClCompile Include="firewall.cpp" /> |
| 41 | </ItemGroup> | 35 | </ItemGroup> |
| 42 | |||
| 43 | <ItemGroup> | 36 | <ItemGroup> |
| 44 | <ClInclude Include="cost.h" /> | 37 | <ClInclude Include="cost.h" /> |
| 45 | <ClInclude Include="CustomMsiErrors.h" /> | 38 | <ClInclude Include="CustomMsiErrors.h" /> |
| 46 | <ClInclude Include="precomp.h" /> | 39 | <ClInclude Include="precomp.h" /> |
| 47 | </ItemGroup> | 40 | </ItemGroup> |
| 48 | |||
| 49 | <ItemGroup> | 41 | <ItemGroup> |
| 50 | <None Include="packages.config" /> | ||
| 51 | <None Include="fwca.def" /> | 42 | <None Include="fwca.def" /> |
| 43 | <None Include="packages.config" /> | ||
| 52 | </ItemGroup> | 44 | </ItemGroup> |
| 53 | |||
| 54 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 45 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 55 | |||
| 56 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 46 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
| 57 | <PropertyGroup> | 47 | <PropertyGroup> |
| 58 | <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> | 48 | <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> |
| 59 | </PropertyGroup> | 49 | </PropertyGroup> |
| 60 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.6\build\WixToolset.DUtil.props'))" /> | 50 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" /> |
| 61 | <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'))" /> | 51 | <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props'))" /> |
| 62 | </Target> | 52 | </Target> |
| 63 | </Project> | 53 | </Project> \ No newline at end of file |
| 64 | |||
diff --git a/src/ca/packages.config b/src/ca/packages.config index b87f9ab4..4e9403bf 100644 --- a/src/ca/packages.config +++ b/src/ca/packages.config | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" /> | 3 | <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" /> |
| 4 | <package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" /> | 4 | <package id="WixToolset.WcaUtil" version="4.0.8" targetFramework="native" /> |
| 5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |
