Skip to content
This repository has been archived by the owner on Jan 23, 2023. It is now read-only.

Commit

Permalink
[automated] Merge branch 'release/2.1' => 'release/2.2' (#27938)
Browse files Browse the repository at this point in the history
* Update CoreClr, CoreFx to servicing-28207-04, servicing-28208-01, respectively (#27899)

* update branding for 2.1 (#27914)

* Fix GetSequencePoints when profiler provides mapping via SetILInstrumentedCodeMap (#27295)

Port #25802 to release/2.1

* Use MicrosoftSHA2 for DAC signing (#27933)

* Use MicrosoftSHA2 for DAC signing

* Fix DAC name
  • Loading branch information
dotnet-maestro-bot authored and mmitche committed Nov 25, 2019
1 parent 7ef9cd2 commit 4440bbf
Showing 1 changed file with 13 additions and 1 deletion.
14 changes: 13 additions & 1 deletion src/sign.builds
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<PropertyGroup>
<!-- The SignFiles target needs OutDir to be defined -->
<OutDir>$(BinDir)</OutDir>
<DebuggingCert>MicrosoftSHA2</DebuggingCert>
</PropertyGroup>

<UsingTask AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll" TaskName="ReadSigningRequired" />
Expand Down Expand Up @@ -35,9 +36,20 @@
Managed assemblies should already have a requires_signing file dropped so only generate
a requires_signing file for ones that don't exist which should leave just native assembies
-->
<ItemGroup>
<!-- The DAC requires special signing for !analyze/watson to work properly. -->
<SpecialDebuggingDlls Include="$(BinDir)$(CrossTargetComponentFolder)/mscordaccore*.dll" />
<SpecialDebuggingDlls Include="$(BinDir)mscordaccore*.dll" />
<WindowsNativeLocation Remove="@(SpecialDebuggingDlls)"/>
</ItemGroup>

<WriteSigningRequired AuthenticodeSig="$(AuthenticodeSig)"
MarkerFile="%(WindowsNativeLocation.Identity).requires_signing"
Condition="!Exists('%(WindowsNativeLocation.Identity).requires_signing')" />

<WriteSigningRequired AuthenticodeSig="$(DebuggingCert)"
MarkerFile="%(SpecialDebuggingDlls.Identity).requires_signing"
Condition="!Exists('%(SpecialDebuggingDlls.Identity).requires_signing')" />
</Target>

<!-- populates item group FilesToSign with the list of files to sign -->
Expand All @@ -63,4 +75,4 @@
<Delete Files="@(SignMarkerFile)" />
</Target>

</Project>
</Project>

0 comments on commit 4440bbf

Please sign in to comment.