From 412bd4935e8c17bbac6246c0ef40ec6ad2cddcb4 Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Mon, 7 Jan 2019 14:57:35 -0800
Subject: [PATCH] Assign FilesToSign in a target (#6459)

---
 build/CodeSign.props           | 5 +++++
 eng/targets/Cpp.Common.props   | 4 ----
 eng/targets/Cpp.Common.targets | 6 ++++++
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/build/CodeSign.props b/build/CodeSign.props
index 73938c6365..19a9dc9dd7 100644
--- a/build/CodeSign.props
+++ b/build/CodeSign.props
@@ -1,5 +1,10 @@
 <Project>
 
+  <ItemGroup>
+    <!-- We don't need to code sign .js files because they are not used in Windows Script Host. -->
+    <FileExtensionsToSign Include=".js" CertificateName="None" />
+  </ItemGroup>
+
   <ItemGroup>
     <!-- Third-party components which should be signed.  -->
       <!-- Microsoft.AspNetCore.App -->
diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props
index 1f06f77b55..f827506c4f 100644
--- a/eng/targets/Cpp.Common.props
+++ b/eng/targets/Cpp.Common.props
@@ -6,10 +6,6 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
-  <ItemGroup>
-    <FilesToSign Include="$(MSBuildProjectDirectory)\$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(ConfigurationType)' == 'DynamicLibrary'" Authenticode="Microsoft400" />
-  </ItemGroup>
-
   <Import Project="MicroBuild.Plugin.props" Condition="'$(MicroBuildSentinelFile)' == ''" />
   <Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.props" Condition=" '$(MicroBuildPluginDirectory)' != ''" />
 
diff --git a/eng/targets/Cpp.Common.targets b/eng/targets/Cpp.Common.targets
index 3c347a4578..ee2528661f 100644
--- a/eng/targets/Cpp.Common.targets
+++ b/eng/targets/Cpp.Common.targets
@@ -3,6 +3,12 @@
 
   <Import Project="$(MicroBuildPluginDirectory)\MicroBuild.Plugins.*\**\build\MicroBuild.Plugins.*.targets" Condition="'$(DisableMicroBuild)' != 'true' AND '$(MicroBuildPluginDirectory)' != ''" />
 
+  <Target Name="GetVcxprojFilesToSign" BeforeTargets="SignFiles">
+    <ItemGroup>
+      <FilesToSign Include="$(OutDir)$(TargetName)$(TargetExt)" Condition="'$(ConfigurationType)' == 'DynamicLibrary'" Authenticode="Microsoft400" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="Pack" />
   <Target Name="Restore" />
   <Target Name="ResolveNuGetPackageAssets" />