Create single .zip file for non-embedded pdb files

No longer create .snupkg/.symbols.nupkgs since they don't actually
support native pdbs, which are all of our non-embedded pdb files.

4 files changed, 35 insertions, 0 deletions

diff --git a/src/internal/SetBuildNumber/global.json.pp b/src/internal/SetBuildNumber/global.json.pp
index 5907efb0..a3485efa 100644
--- a/src/internal/SetBuildNumber/global.json.pp
+++ b/src/internal/SetBuildNumber/global.json.pp
@@ -1,6 +1,7 @@
 {
   "msbuild-sdks": {
     "Microsoft.Build.Traversal": "3.0.23",
+    "Microsoft.Build.NoTargets": "3.3.0",
     "WixToolset.Sdk": "{packageversion}"
   },
   "sdk": {
diff --git a/src/internal/WixBuildFinalize/WixBuildFinalize.proj b/src/internal/WixBuildFinalize/WixBuildFinalize.proj
new file mode 100644
index 00000000..1e0a98d1
--- /dev/null
+++ b/src/internal/WixBuildFinalize/WixBuildFinalize.proj
@@ -0,0 +1,19 @@
+<?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 Sdk="Microsoft.Build.NoTargets">
+  <PropertyGroup>
+    <TargetFramework>net46</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+  </ItemGroup>
+
+  <Target Name="ZipPdbs" DependsOnTargets="__SetPropertiesFromGit" BeforeTargets="AfterBuild">
+    <ZipDirectory
+        SourceDirectory="$(PdbsFolder)"
+        DestinationFile="$(ArtifactsFolder)\wix$(Version)-pdbs.zip"
+        Overwrite="true" />
+  </Target>
+</Project>
diff --git a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
index a96f8d2f..0eae7750 100644
--- a/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
+++ b/src/internal/WixBuildTools.TestSupport.Native/WixBuildTools.TestSupport.Native.vcxproj
@@ -33,6 +33,7 @@
     <CLRSupport>true</CLRSupport>
     <Description>WixBuildTools C++/CLI Test Support</Description>
     <SignOutput>false</SignOutput>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/src/internal/finalize.cmd b/src/internal/finalize.cmd
new file mode 100644
index 00000000..bbd6f01a
--- /dev/null
+++ b/src/internal/finalize.cmd
@@ -0,0 +1,14 @@
+@setlocal
+@pushd %~dp0
+
+@set _C=Debug
+:parse_args
+@if /i "%1"=="release" set _C=Release
+@if not "%1"=="" shift & goto parse_args
+
+@echo Finalize build %_C%
+
+msbuild -Restore WixBuildFinalize\WixBuildFinalize.proj -p:Configuration=%_C% -nologo || exit /b
+
+@popd
+@endlocal