Implement integrated build process

3 files changed, 27 insertions, 38 deletions

diff --git a/src/libs/wcautil/WixToolset.WcaUtil/packages.config b/src/libs/wcautil/WixToolset.WcaUtil/packages.config
deleted file mode 100644
index aa8b4077..00000000
--- a/src/libs/wcautil/WixToolset.WcaUtil/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
-  <package id="WixToolset.DUtil" version="4.0.72" targetFramework="native" />
-</packages>
\ No newline at end of file
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
index a57a5749..b9547a8b 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.nuspec
@@ -1,30 +1,31 @@
 <?xml version="1.0"?>
 <package >
-  <metadata>
+  <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
     <authors>$authors$</authors>
-    <owners>$authors$</owners>
     <license type="expression">MS-RL</license>
-    <projectUrl>https://github.com/wixtoolset/wcautil</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
     <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
     <dependencies>
         <dependency id="WixToolset.DUtil" version="[4,5)" />
     </dependencies>
   </metadata>
 
   <files>
-    <file src="build\$id$.props" target="build\" />
-    <file src="inc\*" target="build\native\include" />
-    <file src="..\..\build\$configuration$\v140\x64\wcautil.lib" target="build\native\v140\x64" />
-    <file src="..\..\build\$configuration$\v140\x86\wcautil.lib" target="build\native\v140\x86" />
-    <file src="..\..\build\$configuration$\v141\x64\wcautil.lib" target="build\native\v141\x64" />
-    <file src="..\..\build\$configuration$\v141\x86\wcautil.lib" target="build\native\v141\x86" />
-    <file src="..\..\build\$configuration$\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" />
-    <file src="..\..\build\$configuration$\v142\x64\wcautil.lib" target="build\native\v142\x64" />
-    <file src="..\..\build\$configuration$\v142\x86\wcautil.lib" target="build\native\v142\x86" />
-    <file src="..\..\build\$configuration$\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" />
+    <file src="$projectFolder$\build\$id$.props" target="build\" />
+    <file src="$projectFolder$\inc\*" target="build\native\include" />
+    <file src="..\..\v140\x64\wcautil.lib" target="build\native\v140\x64" />
+    <file src="..\..\v140\x86\wcautil.lib" target="build\native\v140\x86" />
+    <file src="..\..\v141\x64\wcautil.lib" target="build\native\v141\x64" />
+    <file src="..\..\v141\x86\wcautil.lib" target="build\native\v141\x86" />
+    <file src="..\..\v141\ARM64\wcautil.lib" target="build\native\v141\ARM64" />
+    <file src="..\..\v142\x64\wcautil.lib" target="build\native\v142\x64" />
+    <file src="..\..\v142\x86\wcautil.lib" target="build\native\v142\x86" />
+    <file src="..\..\v142\ARM64\wcautil.lib" target="build\native\v142\ARM64" />
   </files>
 </package>
diff --git a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj
index 6876bd5b..377358ef 100644
--- a/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj
+++ b/src/libs/wcautil/WixToolset.WcaUtil/wcautil.vcxproj
@@ -1,7 +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.72\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|ARM64">
       <Configuration>Debug</Configuration>
@@ -28,6 +28,7 @@
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
+
   <PropertyGroup Label="Globals">
     <ProjectGuid>{5B3714B6-3A76-463E-8595-D48DA276C512}</ProjectGuid>
     <ConfigurationType>StaticLibrary</ConfigurationType>
@@ -36,14 +37,17 @@
     <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
     <Description>WiX Toolset Custom Action native utility library</Description>
+    <PackageId>WixToolset.WcaUtil</PackageId>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="Shared">
-    <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
-  </ImportGroup>
-  <Import Project="..\NativeMultiTargeting.Build.props" />
+
+  <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
+
+  <PropertyGroup>
+    <ProjectAdditionalIncludeDirectories>..\..\dutil\WixToolset.DUtil\inc</ProjectAdditionalIncludeDirectories>
+  </PropertyGroup>
 
   <ItemGroup>
     <ClCompile Include="exbinary.cpp" />
@@ -75,20 +79,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
-  <Target Name="PackNativeNuget"
-          DependsOnTargets="GetBuildVersion">
-    <Exec Command='nuget pack wcautil.nuspec -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Configuration=$(Configuration);Id=WixToolset.WcaUtil;Version="$(BuildVersionSimple)";Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)";Title="$(Title)"' />
-  </Target>
-
   <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\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
-    <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.72\build\WixToolset.DUtil.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+</Project>