diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2020-12-28 19:33:57 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 19:33:57 +0300 |
| commit | 75d5cc3df4dde3b37d75f289b5a90e358da838aa (patch) | |
| tree | ed75d388304564efae902a969fb526876471ec9a /eng/Signing.props | |
| parent | c142f162854185ba45f0fab678f8b28d1add3968 (diff) | |
Avoid deferred Arcade importing (#46397)
* General cleanup and mono import Arcade in root
* More cleanup and coreclr import Arcade root
* Import Arcade root from libraries
* Set informationversion for corelib
* BuildArchitecture cleanup
* Fix property name
* Fix default target invocation of runtime.proj
* specify tfm correctly
* Remove unnecessary TestStrongNameKeyId
* Revert TestStrongNameKeyId removal
* Fix entrypoint target by using M.B.NoTargets
* Fix reference assembly paths
* PR feedback
* Set Platform correctly
* PR feedback and more cleanup
* Move BaselineMicrosoftNetCoreAppPackageVersion
* Fix reference to CoreLib
* Fix OS calculation
* Fix targets importing
* Remove *TargetOS
* Add RuntimeConfiguration doc
* Change conditions in root msbuild files
* installer test fixes
* Cleanup
* More cleanup because of well defined entrypoint
* Don't import D.B.* from installer tests at all
* Rename fix
* Include explicit reference to mscorlib in ilproj
* Update eng/restore/docs.targets
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
* Revert some installer test changes
* Installer test fix again
* Disable EOL tfm check for installer tests
* Set platform later for installer
Co-authored-by: Jan Kotas <jkotas@microsoft.com>
Diffstat (limited to 'eng/Signing.props')
| -rw-r--r-- | eng/Signing.props | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/eng/Signing.props b/eng/Signing.props index 2d29ea85ea4..a0fb8225d1b 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -1,10 +1,5 @@ <Project InitialTargets="SetupFilesToSign"> - <!-- If this file was pulled in via prepare-artifacts.proj (a non-SDK project, these files are already - imported. --> - <Import Project="$(RepositoryEngineeringDir)Configurations.props" Condition="'$(PrepareArtifacts)' != 'true'" /> - <Import Project="$(RepositoryEngineeringDir)liveBuilds.targets" Condition="'$(PrepareArtifacts)' != 'true'" /> - <PropertyGroup> <!-- Windows arm/arm64 jobs don't have MSIs to sign. Keep it simple: allow not finding any matches @@ -45,10 +40,10 @@ <FileExtensionSignInfo Include=".deb;.rpm" CertificateName="LinuxSign" /> </ItemGroup> <ItemGroup Condition="'$(PrepareArtifacts)' == 'true' and '$(PostBuildSign)' == 'true'"> - <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.msi" /> - <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.exe" /> - <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.nupkg" /> - <ItemsToSignWithPaths Include="$(DownloadDirectory)**/*.zip" /> + <ItemsToSignWithPaths Include="$(DownloadDirectory)**\*.msi" /> + <ItemsToSignWithPaths Include="$(DownloadDirectory)**\*.exe" /> + <ItemsToSignWithPaths Include="$(DownloadDirectory)**\*.nupkg" /> + <ItemsToSignWithPaths Include="$(DownloadDirectory)**\*.zip" /> <ItemsToSignWithoutPaths Include="@(ItemsToSignWithPaths->'%(Filename)%(Extension)')" /> <ItemsToSignPostBuild Include="@(ItemsToSignWithoutPaths->Distinct())" /> @@ -61,8 +56,8 @@ </PropertyGroup> <ItemGroup Condition="'$(SignDiagnostics)' == 'true'"> - <ItemsToSign Include="$(DiagnosticsFilesRoot)/**/mscordaccore*.dll" /> - <ItemsToSign Include="$(DiagnosticsFilesRoot)/**/mscordbi.dll" /> + <ItemsToSign Include="$(DiagnosticsFilesRoot)\**\mscordaccore*.dll" /> + <ItemsToSign Include="$(DiagnosticsFilesRoot)\**\mscordbi.dll" /> <!-- The DAC should be signed with the SHA2 cert (both long and short name). We already add the short-name DAC above, so add the long-name DAC here. |