CryptoPro
/
runtime
зеркало из https://github.com/CryptoPro/runtime.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Unify paths used for cross-bit components

This commit is contained in:
Juan Sebastian Hoyos Ayala 2020-10-15 23:46:07 -07:00
Родитель 25e8b0d01e
Коммит 4de00f8188
2 изменённых файлов: 4 добавлений и 9 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
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

5
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 -->