From 1550b30702ae4e83ea8b30bf95a4f20a6424aa4b Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 27 Feb 2021 15:38:50 -0800
Subject: Include native .pdbs in .wixext.nupkg and refine build process
---
src/ca/dependencyca.vcxproj | 35 ++++++++++++++++++++++++-----------
src/ca/packages.config | 5 -----
2 files changed, 24 insertions(+), 16 deletions(-)
delete mode 100644 src/ca/packages.config
(limited to 'src/ca')
diff --git a/src/ca/dependencyca.vcxproj b/src/ca/dependencyca.vcxproj
index 6cc0d24e..750deb3c 100644
--- a/src/ca/dependencyca.vcxproj
+++ b/src/ca/dependencyca.vcxproj
@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- 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. -->
+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" />
- <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -29,6 +28,7 @@
<Platform>ARM64</Platform>
</ProjectConfiguration>
</ItemGroup>
+
<PropertyGroup Label="Globals">
<ProjectGuid>{B86AF46C-0F90-49CC-923F-A800B088D015}</ProjectGuid>
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -39,30 +39,43 @@
<Description>WiX Toolset Dependency CustomAction</Description>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+
<PropertyGroup>
<ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
</PropertyGroup>
+
<ItemGroup>
<ClCompile Include="dllmain.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
<ClCompile Include="wixdepca.cpp" />
</ItemGroup>
+
<ItemGroup>
<ClInclude Include="precomp.h" />
</ItemGroup>
+
<ItemGroup>
- <None Include="packages.config" />
<None Include="wixdepca.def" />
</ItemGroup>
+
+ <ItemGroup>
+ <PackageReference Include="WixToolset.Dutil">
+ <Version>4.0.62</Version>
+ </PackageReference>
+ <PackageReference Include="WixToolset.WcaUtil">
+ <Version>4.0.18</Version>
+ </PackageReference>
+ <PackageReference Include="Microsoft.SourceLink.GitHub">
+ <Version>1.0.0</Version>
+ </PackageReference>
+ <PackageReference Include="Nerdbank.GitVersioning">
+ <Version>3.3.37</Version>
+ </PackageReference>
+ </ItemGroup>
+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
- <PropertyGroup>
- <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>
- </PropertyGroup>
- <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.56\build\WixToolset.DUtil.props'))" />
- <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.17\build\WixToolset.WcaUtil.props'))" />
- </Target>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/ca/packages.config b/src/ca/packages.config
deleted file mode 100644
index 9d88f529..00000000
--- a/src/ca/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="WixToolset.DUtil" version="4.0.56" targetFramework="native" />
- <package id="WixToolset.WcaUtil" version="4.0.17" targetFramework="native" />
-</packages>
\ No newline at end of file
--
cgit v1.2.3-55-g6feb