projects / platform / upstream / dotnet / runtime.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3b9abae) | patch
Fix incorrect merge of my framework crossgenning fix with Jeremy's local live-live...
authorTomáš Rylek <trylek@microsoft.com>
Sat, 14 Dec 2019 22:38:17 +0000 (23:38 +0100)
committerGitHub <noreply@github.com>
Sat, 14 Dec 2019 22:38:17 +0000 (23:38 +0100)
commit040e30e1db7fafba9d5b4b99710903fb416dde39
tree5a359a0fc50c757737d68793b9e6fa69ddd342e3tree | snapshot
parent3b9abae5aae537258611b5750dc7e2963cfc73edcommit | diff
Fix incorrect merge of my framework crossgenning fix with Jeremy's local live-live change (#879)

I found out that in two places my fix for crossgenning the framework
incorrectly merged with Jeremy's live-live change. In particular,
as I was moving around the steps for patching CORE_ROOT with explicit
CoreFX while Jeremy was deleting them, my changes inadvertently
resurrected two such deleted sections.

Thanks

Tomas
src/coreclr/build-test.cmd diff | blob | history
src/coreclr/build-test.sh diff | blob | history
Domain: Dotnet / Core;