Implement integrated build process

3 files changed, 18 insertions, 25 deletions

diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
index 3499a2d5..fef60013 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.nuspec
@@ -1,27 +1,28 @@
 <?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/dutil</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
     <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
   </metadata>
 
   <files>
-    <file src="build\$id$.props" target="build\" />
-    <file src="inc\*" target="build\native\include" />
-    <file src="..\..\build\$configuration$\v140\x64\dutil.lib" target="build\native\v140\x64" />
-    <file src="..\..\build\$configuration$\v140\x86\dutil.lib" target="build\native\v140\x86" />
-    <file src="..\..\build\$configuration$\v141\x64\dutil.lib" target="build\native\v141\x64" />
-    <file src="..\..\build\$configuration$\v141\x86\dutil.lib" target="build\native\v141\x86" />
-    <file src="..\..\build\$configuration$\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" />
-    <file src="..\..\build\$configuration$\v142\x64\dutil.lib" target="build\native\v142\x64" />
-    <file src="..\..\build\$configuration$\v142\x86\dutil.lib" target="build\native\v142\x86" />
-    <file src="..\..\build\$configuration$\v142\ARM64\dutil.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\dutil.lib" target="build\native\v140\x64" />
+    <file src="..\..\v140\x86\dutil.lib" target="build\native\v140\x86" />
+    <file src="..\..\v141\x64\dutil.lib" target="build\native\v141\x64" />
+    <file src="..\..\v141\x86\dutil.lib" target="build\native\v141\x86" />
+    <file src="..\..\v141\ARM64\dutil.lib" target="build\native\v141\ARM64" />
+    <file src="..\..\v142\x64\dutil.lib" target="build\native\v142\x64" />
+    <file src="..\..\v142\x86\dutil.lib" target="build\native\v142\x86" />
+    <file src="..\..\v142\ARM64\dutil.lib" target="build\native\v142\ARM64" />
   </files>
 </package>
diff --git a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
index 4e341438..a02e638a 100644
--- a/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
+++ b/src/libs/dutil/WixToolset.DUtil/dutil.vcxproj
@@ -43,7 +43,7 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
 
-  <Import Project="..\NativeMultiTargeting.Build.props" />
+  <Import Project="..\..\..\NativeMultiTargeting.Build.props" />
 
   <ItemGroup>
     <ClCompile Include="acl2util.cpp" />
@@ -170,13 +170,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="xsd\thmutil.xsd" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/src/libs/dutil/WixToolset.DUtil/packages.config b/src/libs/dutil/WixToolset.DUtil/packages.config
deleted file mode 100644
index 5bbcd994..00000000
--- a/src/libs/dutil/WixToolset.DUtil/packages.config
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Build.Tasks.Git" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.SourceLink.Common" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="Microsoft.SourceLink.GitHub" version="1.0.0" targetFramework="native" developmentDependency="true" />
-  <package id="Nerdbank.GitVersioning" version="3.3.37" targetFramework="native" developmentDependency="true" />
-</packages>
\ No newline at end of file