Reenable and fix post build signing (#9176)

Fixes post build signing so that the manifests are conformant with the requirement that items to sign should also appear in the artifacts section of a manifest.

.vsts-ci.yml

@@ -16,6 +16,8 @@ variables:
   value: https://dotnetclichecksums.blob.core.windows.net/dotnet/index.json
 - name: _PublishUsingPipelines
   value: false
+- name: PostBuildSign
+  value: true
 - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
   - group: DotNet-DotNetCli-Storage
   - group: DotNet-Blob-Feed

eng/Publishing.props

@@ -116,6 +116,18 @@
       </ChecksumsToPushToBlobFeed>
     </ItemGroup>
     
+    <ItemGroup Condition="'$(PostBuildSign)' == 'true'">
+      <ItemsToSignPostBuildWithPaths Include="$(ArtifactsShippingPackagesDir)*.zip" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
+      <ItemsToSignPostBuildWithPaths Include="$(ArtifactsShippingPackagesDir)*.exe" />
+      <ItemsToSignPostBuildWithPaths Include="$(ArtifactsShippingPackagesDir)*.msi" />
+      <ItemsToSignPostBuildWithPaths Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
+      <ItemsToSignPostBuildWithPaths Include="$(ArtifactsNonShippingPackagesDir)*.msi" />
+      <ItemsToSignPostBuildWithPaths Include="$(ArtifactsNonShippingPackagesDir)*.zip" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
+      <ItemsToSignPostBuildWithPaths Include="$(ArtifactsNonShippingPackagesDir)*.nupkg" />
+      <ItemsToSignPostBuild Remove="@(ItemsToSignPostBuild)" />
+      <ItemsToSignPostBuild Include="@(ItemsToSignPostBuildWithPaths->'%(Filename)%(Extension)')" />
+    </ItemGroup>
+
     <PropertyGroup>
       <IsStableBuild>false</IsStableBuild>
       <IsStableBuild Condition="'$(DotNetFinalVersionKind)' == 'release'">true</IsStableBuild>

eng/Signing.props

@@ -2,17 +2,10 @@
 
   <ItemGroup>
     <!-- Do not sign non-shipping packages when doing in-build signing -->
-    <ItemsToSign Remove="$(ArtifactsNonShippingPackagesDir)**\*.nupkg" />
+    <ItemsToSign Remove="$(ArtifactsNonShippingPackagesDir)**\*.nupkg" Condition="'$(PostBuildSign)' != 'true'" />
-  </ItemGroup>
+    <!-- Remove the wixpacks from items to sign post build. These will be added explicitly by the
-
+         custom publishing target. And should not be picked up by arcade's default publishing logic. -->
-  <ItemGroup Condition="'$(PostBuildSign)' == 'true'">
+    <ItemsToSignPostBuild Remove="*.wixpack.zip" />
-    <ItemsToSignPostBuild Include="$(ArtifactsShippingPackagesDir)*.zip" />
-    <ItemsToSignPostBuild Include="$(ArtifactsShippingPackagesDir)*.exe" />
-    <ItemsToSignPostBuild Include="$(ArtifactsShippingPackagesDir)*.msi" />
-    <ItemsToSignPostBuild Include="$(ArtifactsShippingPackagesDir)*.nupkg" />
-    <ItemsToSignPostBuild Include="$(ArtifactsNonShippingPackagesDir)*.msi" />
-    <ItemsToSignPostBuild Include="$(ArtifactsNonShippingPackagesDir)*.zip" />
-    <ItemsToSignPostBuild Include="$(ArtifactsNonShippingPackagesDir)*.nupkg" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -24,6 +17,7 @@
       It is therefore expected that <ItemsToSign> could be an empty set.
     -->
     <AllowEmptySignList>true</AllowEmptySignList>
+    <AllowEmptySignPostBuildList>true</AllowEmptySignPostBuildList>
   </PropertyGroup>
 
   <ItemGroup>