Skip to content

Commit 25c7409

Browse files
authored
[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
2 parents 25e8b0d + aedbe68 commit 25c7409

File tree

3 files changed

+7
-9
lines changed

3 files changed

+7
-9
lines changed

eng/Signing.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@
5050
<FileExtensionSignInfo Include=".deb;.rpm" CertificateName="LinuxSign" />
5151
</ItemGroup>
5252

53-
<ItemGroup Condition="'$(CrossTargetComponentFolder)' != ''">
54-
<CoreCLRCrossTargetItemsToSign Include="$(CoreCLRArtifactsPath)$(CrossTargetComponentFolder)/sharedFramework/*.dll" />
55-
<CoreCLRCrossTargetItemsToSign Include="$(CoreCLRArtifactsPath)$(CrossTargetComponentFolder)/sharedFramework/*.exe" />
53+
<ItemGroup Condition="'$(CoreCLRCrossTargetComponentDirName)' != ''">
54+
<CoreCLRCrossTargetItemsToSign Include="$(CoreCLRArtifactsPath)$(CoreCLRCrossTargetComponentDirName)/sharedFramework/*.dll" />
55+
<CoreCLRCrossTargetItemsToSign Include="$(CoreCLRArtifactsPath)$(CoreCLRCrossTargetComponentDirName)/sharedFramework/*.exe" />
5656
</ItemGroup>
5757

58-
<!-- When doing post build signing, the file containers (e.g. nupkg, msi, etc.) are
58+
<!-- When doing post build signing, the file containers (e.g. nupkg, msi, etc.) are
5959
processed for signing (opened up, individually signed, etc.) and these individual ItemsToSign
6060
elements are unnecessary. When signing within the build, we need to individually process
6161
dll's, exes, etc. that go into msi's because these containers are not able to be processed

src/coreclr/dir.common.props

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@
6565

6666
<!-- We are only tracking Linux Distributions for Nuget RID mapping -->
6767
<DistroRid Condition="'$(TargetsLinux)' == 'true'">$(__DistroRid)</DistroRid>
68-
69-
<!-- Folder for cross target components -->
70-
<CrossTargetComponentFolder Condition="'$(TargetArchitecture)' == 'arm64'">x64</CrossTargetComponentFolder>
71-
<CrossTargetComponentFolder Condition="'$(TargetArchitecture)' == 'arm' and '$(TargetsWindows)' == 'true'">x86</CrossTargetComponentFolder>
72-
<CrossTargetComponentFolder Condition="'$(TargetArchitecture)' == 'arm' and '$(TargetsLinux)' == 'true'">x64</CrossTargetComponentFolder>
7368
</PropertyGroup>
7469

7570
<!-- Set the kind of PDB to Portable -->

src/installer/signing/Directory.Build.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
ArtifactsBinDir=$(ArtifactsBinDir);
2929
ArtifactsPackagesDir=$(ArtifactsPackagesDir);
3030
TargetOS=$(TargetOS);
31+
TargetsLinux=$(TargetsLinux);
32+
TargetsWindows=$(TargetsWindows);
3133
TargetArchitecture=$(TargetArchitecture);
34+
BuildArchitecture=$(BuildArchitecture);
3235
NetCoreAppCurrent=$(NetCoreAppCurrent)" />
3336

3437
<PropertyGroup>

0 commit comments

Comments
 (0)