[release/5.0] Fix missing signatures for Cross bitness DAC symbols (#…

…43499)

* Unify paths used for cross-bit components
* Pass down buildArchitecture for signing
* Pass target properties to signing

eng/Signing.props

@@ -50,12 +50,12 @@
     <FileExtensionSignInfo Include=".deb;.rpm" CertificateName="LinuxSign" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(CrossTargetComponentFolder)' != ''">
-    <CoreCLRCrossTargetItemsToSign Include="$(CoreCLRArtifactsPath)$(CrossTargetComponentFolder)/sharedFramework/*.dll" />
-    <CoreCLRCrossTargetItemsToSign Include="$(CoreCLRArtifactsPath)$(CrossTargetComponentFolder)/sharedFramework/*.exe" />
+  <ItemGroup Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''">
+    <CoreCLRCrossTargetItemsToSign Include="$(CoreCLRArtifactsPath)$(CoreCLRCrossTargetComponentDirName)/sharedFramework/*.dll" />
+    <CoreCLRCrossTargetItemsToSign Include="$(CoreCLRArtifactsPath)$(CoreCLRCrossTargetComponentDirName)/sharedFramework/*.exe" />
   </ItemGroup>
 
-  <!-- When doing post build signing, the file containers (e.g. nupkg, msi, etc.) are 
+  <!-- When doing post build signing, the file containers (e.g. nupkg, msi, etc.) are
        processed for signing (opened up, individually signed, etc.) and these individual ItemsToSign
        elements are unnecessary. When signing within the build, we need to individually process
        dll's, exes, etc. that go into msi's because these containers are not able to be processed

src/coreclr/dir.common.props

@@ -65,11 +65,6 @@
 
     <!-- We are only tracking Linux Distributions for Nuget RID mapping -->
     <DistroRid Condition="'$(TargetsLinux)' == 'true'">$(__DistroRid)</DistroRid>
-
-    <!-- Folder for cross target components -->
-    <CrossTargetComponentFolder Condition="'$(TargetArchitecture)' == 'arm64'">x64</CrossTargetComponentFolder>
-    <CrossTargetComponentFolder Condition="'$(TargetArchitecture)' == 'arm' and '$(TargetsWindows)' == 'true'">x86</CrossTargetComponentFolder>
-    <CrossTargetComponentFolder Condition="'$(TargetArchitecture)' == 'arm' and '$(TargetsLinux)' == 'true'">x64</CrossTargetComponentFolder>
   </PropertyGroup>
 
   <!-- Set the kind of PDB to Portable -->

src/installer/signing/Directory.Build.targets

@@ -28,7 +28,10 @@
         ArtifactsBinDir=$(ArtifactsBinDir);
         ArtifactsPackagesDir=$(ArtifactsPackagesDir);
         TargetOS=$(TargetOS);
+        TargetsLinux=$(TargetsLinux);
+        TargetsWindows=$(TargetsWindows);
         TargetArchitecture=$(TargetArchitecture);
+        BuildArchitecture=$(BuildArchitecture);
         NetCoreAppCurrent=$(NetCoreAppCurrent)" />
 
     <PropertyGroup>