From ffc0b7aa63799732b8c863228cf99c5ec3301222 Mon Sep 17 00:00:00 2001
From: Juan Hoyos <juan.hoyos@microsoft.com>
Date: Wed, 18 Nov 2020 22:10:51 -0800
Subject: [PATCH] Ensure Debugging assets are signed. (#44915)

---
 eng/pipelines/coreclr/templates/build-job.yml     | 8 ++++----
 eng/pipelines/coreclr/templates/crossdac-pack.yml | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/pipelines/coreclr/templates/build-job.yml b/eng/pipelines/coreclr/templates/build-job.yml
index 1ecc84e..dae8c8a 100644
--- a/eng/pipelines/coreclr/templates/build-job.yml
+++ b/eng/pipelines/coreclr/templates/build-job.yml
@@ -111,7 +111,7 @@ jobs:
     - ${{ if eq(parameters.testGroup, 'clrinterpreter') }}:
       - name: clrInterpreterBuildArg
         value: '-cmakeargs "-DFEATURE_INTERPRETER=1"'
-    
+
     - name: clrBuildPALTestsBuildArg
       value: ''
     - ${{ if ne(parameters.testGroup, 'innerloop') }}:
@@ -123,7 +123,7 @@ jobs:
     - ${{ if eq(parameters.osGroup, 'windows') }}:
       - name: ninjaArg
         value: '-ninja'
-  
+
     - name: SignType
       value: $[ coalesce(variables.OfficialSignType, 'real') ]
 
@@ -170,7 +170,7 @@ jobs:
     # Build DacTableGen (Windows-only)
     - ${{ if eq(parameters.osGroup, 'windows') }}:
       - script: $(Build.SourcesDirectory)$(dir)build$(scriptExt) -subset clr.dactools $(crossArg) -arch $(archType) $(osArg) -c $(buildConfig) $(officialBuildIdArg) -ci /bl:$(Build.SourcesDirectory)artifacts/logs/$(buildConfig)/DacTools.binlog
-        displayName: Build managed product components and packages
+        displayName: Build DAC utility tools
 
     # Build CoreCLR Runtime
     - ${{ if ne(parameters.osGroup, 'windows') }}:
@@ -225,7 +225,7 @@ jobs:
     # Sign diagnostic files on Windows
     - ${{ if and(eq(parameters.osGroup, 'windows'), eq(parameters.signBinaries, true)) }}:
       - powershell: >-
-          eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0
+          eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 $(officialBuildIdArg)
           /p:DiagnosticsFilesRoot="$(buildProductRootFolderPath)"
           /p:SignDiagnostics=true
           /p:DotNetSignType=$(SignType)
diff --git a/eng/pipelines/coreclr/templates/crossdac-pack.yml b/eng/pipelines/coreclr/templates/crossdac-pack.yml
index c782e36..4309baa 100644
--- a/eng/pipelines/coreclr/templates/crossdac-pack.yml
+++ b/eng/pipelines/coreclr/templates/crossdac-pack.yml
@@ -77,7 +77,7 @@ jobs:
     # Sign diagnostic files
     - ${{ if eq(parameters.isOfficialBuild, true) }}:
       - powershell: >-
-          eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0
+          eng\common\build.ps1 -ci -sign -restore -configuration:$(buildConfig) -warnaserror:0 $(officialBuildIdArg)
           /p:PackagesFolder="$(Build.SourcesDirectory)/artifacts/packages/$(buildConfig)"
           /p:SignDiagnosticsPackages=true
           /p:DotNetSignType=$(SignType)
-- 
2.7.4