Integrate new build scripts with signing support

2 files changed, 28 insertions, 5 deletions

diff --git a/src/stub/stub.nuspec b/src/stub/stub.nuspec
new file mode 100644
index 00000000..968feff3
--- /dev/null
+++ b/src/stub/stub.nuspec
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <metadata minClientVersion="4.0">
+    <id>$id$</id>
+    <version>$version$</version>
+    <title>$title$</title>
+    <description>$description$</description>
+    <authors>$authors$</authors>
+    <license type="expression">MS-RL</license>
+    <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <copyright>$copyright$</copyright>
+    <projectUrl>$projectUrl$</projectUrl>
+    <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
+  </metadata>
+
+  <files>
+    <file src="$projectFolder$$id$.props" target="buildTransitive" />
+    <file src="..\..\build\$configuration$\Win32\burn.exe" target="tools\x86" />
+    <file src="..\..\build\$configuration$\Win32\burn.pdb" target="tools\x86" />
+    <file src="..\..\build\$configuration$\x64\burn.exe" target="tools\x64" />
+    <file src="..\..\build\$configuration$\x64\burn.pdb" target="tools\x64" />
+    <file src="..\..\build\$configuration$\arm64\burn.exe" target="tools\arm64" />
+    <file src="..\..\build\$configuration$\arm64\burn.pdb" target="tools\arm64" />
+  </files>
+</package>
diff --git a/src/stub/stub.vcxproj b/src/stub/stub.vcxproj
index 38710865..97972848 100644
--- a/src/stub/stub.vcxproj
+++ b/src/stub/stub.vcxproj
@@ -46,6 +46,8 @@
     <!-- NBGV properties -->
     <AssemblyLanguage>1033</AssemblyLanguage>
     <AssemblyProduct>Burn</AssemblyProduct>
+    <PackageId>WixToolset.Burn</PackageId>
+    <SignOutput>false</SignOutput>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -101,10 +103,6 @@
     <None Include="packages.config" />
   </ItemGroup>
 
-  <Target Name="Pack" DependsOnTargets="GetBuildVersion">
-    <Exec Command='nuget pack WixToolset.Burn.nuspec -Symbols -BasePath "$(BaseOutputPath)$(Configuration)" -OutputDirectory "$(BaseOutputPath)$(Configuration)" -Properties Id=WixToolset.Burn;Version="$(BuildVersionSimple)";ProjectFolder=$(MSBuildThisFileDirectory);Authors="$(Authors)";Copyright="$(Copyright)";Description="$(Description)"' />
-  </Target>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -119,4 +117,4 @@
     <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.3.3.37\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.3.3.37\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>