Fix code signing for multi-target builds

Author: Chris Martinez

after.apiversioning.sln.targets

@@ -1,34 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <Import Project="build\signing.targets" />
+ <Import Project="build\signing.targets" />
 
-  <Target Name="AfterSolutionBuild" AfterTargets="Build">
+ <Target Name="AfterSolutionBuild" AfterTargets="Build">
 
-    <PropertyGroup>
-      <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-      <BuildProperties>Configuration=$(Configuration)</BuildProperties>
-      <BuildProperties Condition=" ('$(Platform)' != '') AND ('$(Platform)' != 'AnyCPU') AND ('$(Platform)' != 'Any CPU') ">$(BuildProperties);Platform=$(Platform)</BuildProperties>
-    </PropertyGroup>
+  <PropertyGroup>
+   <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+   <BuildProperties>Configuration=$(Configuration)</BuildProperties>
+   <BuildProperties Condition=" ('$(Platform)' != '') AND ('$(Platform)' != 'AnyCPU') AND ('$(Platform)' != 'Any CPU') ">$(BuildProperties);Platform=$(Platform)</BuildProperties>
+  </PropertyGroup>
 
-    <ItemGroup>
-      <Projects Include="src\**\*.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+   <Projects Include="src\**\*.csproj" />
+  </ItemGroup>
 
-    <MSBuild Projects="@(Projects)" Targets="GetTargetPath" Properties="$(BuildProperties)" UnloadProjectsOnCompletion="true">
-      <Output TaskParameter="TargetOutputs" ItemName="TargetFiles" />
-    </MSBuild>
+  <MSBuild Projects="@(Projects)" Targets="GetTargetPaths" Properties="$(BuildProperties)" UnloadProjectsOnCompletion="true">
+   <Output TaskParameter="TargetOutputs" ItemName="TargetFiles" />
+  </MSBuild>
 
-    <PropertyGroup>
-      <!-- transform list to pipe-separated values so we can forward it as a parameter using a build property -->
-      <SigningProperties>
-        SourceDir=$(MSBuildThisFileDirectory)\src;
-        FilesToSign=@(TargetFiles->'%(Identity)','|')
-      </SigningProperties>
-    </PropertyGroup>
+  <PropertyGroup>
+   <!-- transform list to pipe-separated values so we can forward it as a parameter using a build property -->
+   <SigningProperties>
+    SourceDir=$(MSBuildThisFileDirectory)\src;
+    FilesToSign=@(TargetFiles->'%(Identity)','|')
+   </SigningProperties>
+  </PropertyGroup>
 
-    <MSBuild Projects ="$(MSBuildThisFileFullPath)" Targets="WriteCodeSigningFileList" Properties="$(SigningProperties)" />
+  <MSBuild Projects ="$(MSBuildThisFileFullPath)" Targets="WriteCodeSigningFileList" Properties="$(SigningProperties)" />
 
-  </Target>
+ </Target>
 
 </Project>

src/directory.build.targets

@@ -1,17 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <PropertyGroup Label="Common">
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <DocumentationFile Condition=" '$(DocumentationFile)' == '' " >bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+ <PropertyGroup Label="Common">
+  <GenerateDocumentationFile>true</GenerateDocumentationFile>
+  <DocumentationFile Condition=" '$(DocumentationFile)' == '' " >bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
+ </PropertyGroup>
+
+ <ImportGroup Condition=" '$(MSBuildProjectExtension)' != '.shproj' ">
+  <Import Project="..\build\resource.targets" />
+  <Import Project="..\build\file-version.targets" />
+  <Import Project="..\build\nuget.targets" />
+ </ImportGroup>
+
+ <Target Name="GetTargetPath" Outputs="$(TargetPath)" />
+
+ <Target Name="GetTargetPaths" Outputs="@(TargetFiles)">
+
+  <PropertyGroup>
+   <TargetFrameworks Condition=" '$(TargetFrameworks)' == '' " >$(TargetFramework)</TargetFrameworks>
+   <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+   <BuildProperties>Configuration=$(Configuration)</BuildProperties>
+   <BuildProperties Condition=" ('$(Platform)' != '') AND ('$(Platform)' != 'AnyCPU') AND ('$(Platform)' != 'Any CPU') ">$(BuildProperties);Platform=$(Platform)</BuildProperties>
   </PropertyGroup>
 
-  <ImportGroup Condition=" '$(MSBuildProjectExtension)' != '.shproj' ">
-    <Import Project="..\build\resource.targets" />
-    <Import Project="..\build\file-version.targets" />
-    <Import Project="..\build\nuget.targets" />
-  </ImportGroup>
+  <ItemGroup>
+   <_TargetFrameworks Include="$(TargetFrameworks.Split(';'))" />
+  </ItemGroup>
+
+  <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="GetTargetPath" Properties="$(BuildProperties);TargetFramework=%(_TargetFrameworks.Identity)" UnloadProjectsOnCompletion="true">
+   <Output TaskParameter="TargetOutputs" ItemName="TargetFiles" />
+  </MSBuild>
 
-  <Target Name="GetTargetPath" Outputs="$(TargetPath)" />
+ </Target>
 
 </Project>