From 604e690d64eed310138d204297c853d9dde4a354 Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Fri, 11 Nov 2022 14:07:09 -0800
Subject: [PATCH] Avoid missing signing files in zips (#14966)

* Avoid missing signing files in zips

* Try again with broader paths to avoid dupes

* One more time

* Revert unchanged
---
 eng/Signing.props | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/eng/Signing.props b/eng/Signing.props
index 3a2373f9e..0d49f78d1 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -7,12 +7,9 @@
   </ItemGroup>
   <ItemGroup Condition="'$(PostBuildSign)' != 'true'">
     <ItemsToSign Remove="@(ItemsToSign)" />
-    <ItemsToSign Include="$(ArtifactsShippingPackagesDir)*.zip" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
-    <ItemsToSign Include="$(ArtifactsShippingPackagesDir)*.exe" />
-    <ItemsToSign Include="$(ArtifactsShippingPackagesDir)*.msi" />
-    <ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)*.msi" />
-    <ItemsToSign Include="$(ArtifactsNonShippingPackagesDir)*.zip" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
-    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.wixpack.zip" />
+    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.exe" />
+    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.zip" />
+    <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.msi" />
     <ItemsToSign Include="$(ArtifactsPackagesDir)**\*.nupkg" />
   </ItemGroup>