From e8efb2c4c39a1de09a7fd73d88ed4a1ab936826c Mon Sep 17 00:00:00 2001
From: Tomas <trylek@microsoft.com>
Date: Fri, 7 Feb 2020 19:04:56 +0100
Subject: [PATCH] Fix signing in PR runs

Make URCT copying unconditional to unblock installer tasks in debug
mode.

Thanks

Tomas
---
 eng/pipelines/installer/jobs/base-job.yml | 6 +-----
 src/coreclr/src/build.proj                | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/eng/pipelines/installer/jobs/base-job.yml b/eng/pipelines/installer/jobs/base-job.yml
index 952a51eaac46f..60e766303adc7 100644
--- a/eng/pipelines/installer/jobs/base-job.yml
+++ b/eng/pipelines/installer/jobs/base-job.yml
@@ -68,12 +68,8 @@ jobs:
       eq(parameters.isOfficialBuild, true),
       ne(parameters.crossrootfsDir, '')) }}
 
-  # TODO: (Consolidation) Enable test signing during PR validation. https://github.com/dotnet/runtime/issues/1026
-  #
-  # CoreCLR only produces the UCRT redist file in Release config. When the redist file isn't
-  # present, signing fails. For now, only sign in official builds which only run Release mode.
   - name: SignType
-    value: ''
+    value: test
 
   # Set up non-PR build from internal project
   - ${{ if eq(parameters.isOfficialBuild, true) }}:
diff --git a/src/coreclr/src/build.proj b/src/coreclr/src/build.proj
index 4cf380346a271..af6a867b6d9b3 100644
--- a/src/coreclr/src/build.proj
+++ b/src/coreclr/src/build.proj
@@ -20,7 +20,7 @@
       <UcrtFilesToCopy Include="$(UniversalCRTSDKDir)Redist\ucrt\DLLs\$(BuildArch)\*.dll" />
     </ItemGroup>
 
-    <Copy Condition="'$(BuildType)'=='Release' AND '$(BuildArch)' != 'arm64'"
+    <Copy Condition="'$(BuildArch)' != 'arm64'"
         SourceFiles="@(UcrtFilesToCopy)"
         DestinationFolder="$(BinDir)Redist\ucrt\DLLs\$(BuildArch)" />
   </Target>