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

[automated] Merge branch 'release/2.1' => 'release/2.2' #27938

Merged
merged 5 commits into from
Nov 25, 2019
Merged

[automated] Merge branch 'release/2.1' => 'release/2.2' #27938

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0975eb1
Update CoreClr, CoreFx to servicing-28207-04, servicing-28208-01, res…
dotnet-maestro-bot Nov 21, 2019
baab524
update branding for 2.1 (#27914)
Anipik Nov 22, 2019
d36fefc
Fix GetSequencePoints when profiler provides mapping via SetILInstrum…
davmason Nov 22, 2019
38cc993
Use MicrosoftSHA2 for DAC signing (#27933)
hoyosjs Nov 25, 2019
bee3a1b
Merge branch 'release/2.2' into merge/release/2.1-to-release/2.2
mmitche Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/sign.builds
View file
Open in desktop
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>