From 3b5f261d62644c2a6bcd30fb83d2acb95d40454a Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <jestedfa@microsoft.com>
Date: Wed, 14 Aug 2024 13:16:42 -0400
Subject: [PATCH] Generate binlog for signing process and publish as an
 artifact

---
 azure-pipelines/build.yml              | 10 ++++++++--
 azure-pipelines/nuget-package.signproj |  4 ++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml
index aa77e5977..df3a487a1 100644
--- a/azure-pipelines/build.yml
+++ b/azure-pipelines/build.yml
@@ -56,6 +56,12 @@ extends:
             sbom:
               enabled: true
           outputs:
+          - output: pipelineArtifact
+            displayName: 'Publish Logs'
+            condition: always()
+            targetPath: '$(Build.ArtifactStagingDirectory)\Logs'
+            artifactType: container
+            sbomEnabled: false
           - output: nuget
             displayName: 'Publish packages to NuGet.org'
             condition: and(succeeded(), eq(variables['Build.OfficialRelease'], 'true'))
@@ -114,10 +120,10 @@ extends:
           displayName: Build Mappings NuGet package
           inputs:
             solution: src\UpgradeAssistant.Mappings\UpgradeAssistant.Mappings.csproj
-            msbuildArgs: /t:Pack /p:PublicRelease=$(Build.OfficialRelease) /p:TimestampPackage=$(TimestampPackage) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)\UnsignedPackages"
+            msbuildArgs: /t:Pack /p:PublicRelease=$(Build.OfficialRelease) /p:TimestampPackage=$(TimestampPackage) /p:PackageOutputPath="$(Build.ArtifactStagingDirectory)\Packages"
             configuration: release
         - task: MSBuild@1
           displayName: 'Sign Mappings NuGet Package'
           inputs:
             solution: 'azure-pipelines\nuget-package.signproj'
-            msbuildArguments: '/v:diagnostic /p:OutDir=$(Build.ArtifactStagingDirectory)\Packages /p:UnsignedPackagesPath=$(Build.ArtifactStagingDirectory)\UnsignedPackages'
+            msbuildArguments: '/v:diagnostic /bl:$(Build.ArtifactStagingDirectory)\Logs\nuget-package-signing.binlog /p:OutDir=$(Build.ArtifactStagingDirectory)\Packages /p:PackagesPath=$(Build.ArtifactStagingDirectory)\Packages'
diff --git a/azure-pipelines/nuget-package.signproj b/azure-pipelines/nuget-package.signproj
index 47fe93528..9a8e95779 100644
--- a/azure-pipelines/nuget-package.signproj
+++ b/azure-pipelines/nuget-package.signproj
@@ -8,9 +8,9 @@
     <PackageReference Include="Microsoft.VisualStudioEng.MicroBuild.Core" version="1.0.0" />
   </ItemGroup>
 
-  <Target Name="Sign" DependsOnTargets="$(SignDependsOn)" AfterTargets="AfterBuild">
+  <Target Name="CollectNuGetPackagesToSign" DependsOnTargets="$(SignDependsOn)" BeforeTargets="SignFiles">
     <ItemGroup>
-      <FilesToSign Include="$(UnsignedPackagesPath)\*.nupkg">
+      <FilesToSign Include="$(PackagesPath)\*.nupkg">
         <Authenticode>NuGet</Authenticode>
       </FilesToSign>
     </ItemGroup>