From e103be995f566e42ea4cf91fda5dd0e940e5aabd Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 17 Feb 2022 13:02:04 -0800
Subject: 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.
---
 src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj   | 1 +
 src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec                   | 4 ----
 src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec           | 3 ---
 src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec     | 4 ----
 src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec               | 4 ----
 src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec                   | 4 ----
 src/ext/UI/wixext/WixToolset.UI.wixext.nuspec                     | 2 --
 src/ext/Util/wixext/WixToolset.Util.wixext.nuspec                 | 4 ----
 src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec | 2 --
 9 files changed, 1 insertion(+), 27 deletions(-)

(limited to 'src/ext')

diff --git a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj
index 12abe976..68e66741 100644
--- a/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj
+++ b/src/ext/Bal/test/examples/TestEngine/Example.TestEngine.vcxproj
@@ -35,6 +35,7 @@
     <ProjectSubSystem>Console</ProjectSubSystem>
     <TargetName>Example.TestEngine</TargetName>
     <CharacterSet>Unicode</CharacterSet>
+    <IsWixTestProject>true</IsWixTestProject>
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
index 5bf600fb..4abfa98c 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
+++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
@@ -20,9 +20,5 @@
     <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
 
     <file src="$id$.dll" target="tools" />
-
-    <file src="..\x86\*.pdb" target="pdbs\x86" />
-    <file src="..\x64\*.pdb" target="pdbs\x64" />
-    <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
   </files>
 </package>
diff --git a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
index 20712f58..7143d993 100644
--- a/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
+++ b/src/ext/ComPlus/wixext/WixToolset.ComPlus.wixext.nuspec
@@ -17,8 +17,5 @@
     <file src="$projectFolder$\$id$.targets" target="build" />
 
     <file src="$id$.dll" target="tools" />
-
-    <file src="..\x86\*.pdb" target="pdbs\x86" />
-    <file src="..\x64\*.pdb" target="pdbs\x64" />
   </files>
 </package>
diff --git a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec
index da07f591..7143d993 100644
--- a/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec
+++ b/src/ext/Dependency/wixext/WixToolset.Dependency.wixext.nuspec
@@ -17,9 +17,5 @@
     <file src="$projectFolder$\$id$.targets" target="build" />
 
     <file src="$id$.dll" target="tools" />
-
-    <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
-    <file src="..\x86\*.pdb" target="pdbs\x86" />
-    <file src="..\x64\*.pdb" target="pdbs\x64" />
   </files>
 </package>
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
index 73df56ab..4abfa98c 100644
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
@@ -20,9 +20,5 @@
     <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
 
     <file src="$id$.dll" target="tools" />
-
-    <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
-    <file src="..\x86\*.pdb" target="pdbs\x86" />
-    <file src="..\x64\*.pdb" target="pdbs\x64" />
   </files>
 </package>
diff --git a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec b/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec
index da07f591..7143d993 100644
--- a/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec
+++ b/src/ext/Sql/wixext/WixToolset.Sql.wixext.nuspec
@@ -17,9 +17,5 @@
     <file src="$projectFolder$\$id$.targets" target="build" />
 
     <file src="$id$.dll" target="tools" />
-
-    <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
-    <file src="..\x86\*.pdb" target="pdbs\x86" />
-    <file src="..\x64\*.pdb" target="pdbs\x64" />
   </files>
 </package>
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
index 33a43d34..4abfa98c 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
@@ -20,7 +20,5 @@
     <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
 
     <file src="$id$.dll" target="tools" />
-
-    <file src="..\x86\*.pdb" target="pdbs\x86" />
   </files>
 </package>
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
index 73df56ab..4abfa98c 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
@@ -20,9 +20,5 @@
     <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
 
     <file src="$id$.dll" target="tools" />
-
-    <file src="..\ARM64\*.pdb" target="pdbs\ARM64" />
-    <file src="..\x86\*.pdb" target="pdbs\x86" />
-    <file src="..\x64\*.pdb" target="pdbs\x64" />
   </files>
 </package>
diff --git a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
index 504d4458..7143d993 100644
--- a/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
+++ b/src/ext/VisualStudio/wixext/WixToolset.VisualStudio.wixext.nuspec
@@ -17,7 +17,5 @@
     <file src="$projectFolder$\$id$.targets" target="build" />
 
     <file src="$id$.dll" target="tools" />
-
-    <file src="..\x86\*.pdb" target="pdbs\x86" />
   </files>
 </package>
-- 
cgit v1.2.3-55-g6feb