From 0838904d3ecc73f0b64686aa758c088687f05fe2 Mon Sep 17 00:00:00 2001
From: Wes Haggard <Wes.Haggard@microsoft.com>
Date: Tue, 14 Feb 2017 12:52:32 -0800
Subject: [PATCH] Update signing.targets to disable full signing on unix

Issue https://github.com/dotnet/roslyn/issues/8210 blocks signing
on unix, but we still need to have the assemblies have the correct
identity so we are simply turning on DelaySigning for those assemblies.


Commit migrated from https://github.com/dotnet/corefx/commit/4d47c2d2dec3d5083030a3a70baa5fca443669be
---
 src/libraries/Tools-Override/sign.targets | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/libraries/Tools-Override/sign.targets b/src/libraries/Tools-Override/sign.targets
index e827c4574b843..23da65f05ea45 100644
--- a/src/libraries/Tools-Override/sign.targets
+++ b/src/libraries/Tools-Override/sign.targets
@@ -8,9 +8,8 @@
 
   <UsingTask AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" TaskName="OpenSourceSign" />
   <UsingTask AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" TaskName="WriteSigningRequired" />
-  
+
   <PropertyGroup Condition="'$(SkipSigning)'!='true'">
-    <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile Condition="'$(AssemblyOriginatorKeyFile)' == ''">$(ToolsDir)MSFT.snk</AssemblyOriginatorKeyFile>
     <AssemblyOriginatorKeyFile Condition="'$(UseECMAKey)' == 'true'">$(ToolsDir)ECMA.snk</AssemblyOriginatorKeyFile>
     <AssemblyOriginatorKeyFile Condition="'$(UseOpenKey)' == 'true'">$(ToolsDir)Open.snk</AssemblyOriginatorKeyFile>
@@ -18,16 +17,20 @@
     <!-- Don't sign test assemblies with the Microsoft Key, as this affects APIs checking if the test assembly is an MS Key -->
     <AssemblyOriginatorKeyFile Condition="'$(IsTestProject)' == 'true'">$(ToolsDir)Test.snk</AssemblyOriginatorKeyFile>
 
+    <SignAssembly>true</SignAssembly>
     <DelaySign>true</DelaySign>
-    <DelaySign Condition="'$(UseOpenKey)' == 'true'">false</DelaySign>
+
+    <!-- For full keys we should disable delay signing -->
+    <FullPublicPrivateKey Condition="'$(AssemblyOriginatorKeyFile)' == '$(ToolsDir)Open.snk'">true</FullPublicPrivateKey>
+    <FullPublicPrivateKey Condition="'$(AssemblyOriginatorKeyFile)' == '$(ToolsDir)Test.snk'">true</FullPublicPrivateKey>
+
+    <DelaySign Condition="'$(FullPublicPrivateKey)' == 'true'">false</DelaySign>
+
     <!--
-      We enable the signing for the test projects only on Windows because Roslyn not supporting full signing on non-Windows platforms.
-      Issue: https://github.com/dotnet/roslyn/issues/8210
+      Setting DelaySign to true when running build on unix because of Roslyn doesn't support full signing on non-windows.
+      See issue https://github.com/dotnet/roslyn/issues/8210.
     -->
-    <DelaySign Condition="'$(OSEnvironment)' == 'Windows_NT' And '$(IsTestProject)' == 'true'">false</DelaySign>
-
-    <SignType Condition="'$(SignType)'=='' And '$(UseOpenKey)' == 'true'">real</SignType>
-    <SignType Condition="'$(SignType)'=='' And '$(IsTestProject)' == 'true'">real</SignType>
+    <DelaySign Condition="'$(RunningOnUnix)' == 'true'">true</DelaySign>
 
     <DefineConstants>$(DefineConstants);SIGNED</DefineConstants>
     <!-- applicable values for SignType are oss, test or real -->
@@ -40,7 +43,7 @@
   <!-- writes a signing marker file containing the required signatures -->
   <Target Name="WriteSigningRequired"
           AfterTargets="AfterBuild"
-          Condition="'$(SkipSigning)' != 'true' and '$(IsTestProject)' != 'true' and '$(SignType)' != 'oss'"
+          Condition="'$(SkipSigning)' != 'true' and '$(FullPublicPrivateKey)' != 'true' and '$(SignType)' != 'oss'"
           Inputs="$(TargetPath)"
           Outputs="$(TargetPath).requires_signing">
     <WriteSigningRequired AuthenticodeSig="$(AuthenticodeSig)"