From 12806465d8044f6f7acfa29b5b9865c9a8fd3873 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 18 Dec 2017 19:44:50 -0800 Subject: [PATCH] Crossgen SharedFx - And produce symbols for crossgen'ed binaries --- build/SharedFx.targets | 145 +++++++++++++++++- .../templates/RS.Manifest/RS.Manifest.csproj | 6 +- .../tools/templates/SharedFx/SharedFx.csproj | 21 +++ vim.exe.stackdump | 19 +++ 4 files changed, 183 insertions(+), 8 deletions(-) create mode 100644 vim.exe.stackdump diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 213fe2d9ad..74bf172878 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -36,7 +36,7 @@ - + <_AcceptableSharedFxRIDs Include="win-x64;win-x86;osx-x64;linux-x64"/> @@ -53,6 +53,10 @@ $(_WorkRoot)SharedFx\ $(_WorkRoot)Publish\ + $(_WorkRoot)CrossGen\ + $(_WorkRoot)CrossGenSymbols\ + $(_WorkRoot)CrossGenTool\ + $(_WorkRoot)CrossGenRsp\ $(SharedFxIntermediateOutputPath)shared\Microsoft.AspNetCore.All\$(PackageVersion)\ $(SharedFxRID) @@ -78,7 +82,9 @@ + + + DestinationFiles="$(SharedFxPublishDirectory)\Microsoft.AspNetCore.All.deps.json" /> + DestinationFiles="$(SharedFxPublishDirectory)\Microsoft.AspNetCore.All.runtimeconfig.json" /> @@ -148,6 +154,137 @@ OutputPath="$(SharedFxOutputPath)$(SharedFxInstallerName)-$(SharedFxRID)-version-badge.svg" Label="version" Value="$(PackageVersion)" /> + + + + + Microsoft.NETCore.App + crossgen + $(CrossGenTool).exe + + lib + .so + .dll + .dylib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_AssembliesToCrossgen Include="$(SharedFxPublishDirectory)**\*.dll" /> + + + + + + + + + + + %(FullPath) + $(SharedFxCrossGenRspDirectory)%(RecursiveDir)%(Filename).rsp + $(SharedFxCrossGenRspDirectory)%(RecursiveDir)%(Filename).symbols.rsp + $(SharedFxCrossGenDirectory)%(RecursiveDir)%(Filename)%(Extension) + $(SharedFxCrossGenDirectory)%(RecursiveDir) + + + + + + + + + + + + + + + + + + + + + + + + + + CreatePerfMap + CreatePDB + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -160,4 +297,6 @@ WorkingDirectory="$(SharedFxIntermediateOutputPath)" Overwrite="true"/> + + diff --git a/build/tools/templates/RS.Manifest/RS.Manifest.csproj b/build/tools/templates/RS.Manifest/RS.Manifest.csproj index e040db7443..c0836b81dd 100644 --- a/build/tools/templates/RS.Manifest/RS.Manifest.csproj +++ b/build/tools/templates/RS.Manifest/RS.Manifest.csproj @@ -21,11 +21,7 @@ - - - - - + diff --git a/build/tools/templates/SharedFx/SharedFx.csproj b/build/tools/templates/SharedFx/SharedFx.csproj index 47ba6451f9..0c9298a024 100644 --- a/build/tools/templates/SharedFx/SharedFx.csproj +++ b/build/tools/templates/SharedFx/SharedFx.csproj @@ -23,4 +23,25 @@ + + + + + + + + + + + + diff --git a/vim.exe.stackdump b/vim.exe.stackdump new file mode 100644 index 0000000000..1c3c9fde5b --- /dev/null +++ b/vim.exe.stackdump @@ -0,0 +1,19 @@ +Stack trace: +Frame Function Args +00180219490 0018005CE9E (0018021A639, 0018021AC39, 000FFFFC5A0, 000FFFFB730) +00180219490 00180046559 (C0C0C000008080, FF000000808080, FFFF000000FF00, FF00FF000000FF) +00180219490 00180046592 (0018021A616, 000FFFFC498, 000FFFFC5A0, 80808000C0C0C0) +00180219490 00180043393 (00000000000, 00180219490, 7FFFA4B2D68E, 001800004EC) +00180219490 0018006AD51 (C0C0C000008080, FF000000808080, FFFF000000FF00, FF00FF000000FF) +00180219490 0018006BBAC (00000000000, 00100642F08, 00000000000, 00000000000) +00180219490 0018006DCF3 (00000000000, 00000000008, 005FCB3D890, 00000000000) +006000491C0 00180130E86 (00100642F00, 00000000008, 00000000000, 00000000000) +006000491C0 0018011A58B (00100642F00, 00000000008, 00000000000, 00000000000) +006000491C0 001004F30D4 (0010056DA8A, 00100649888, 00000000000, 0010064988C) +006000491C0 001005736D3 (00600000008, 00100649CE0, 00000000000, 00000000000) +006000491C0 0010056E9A6 (00100649CE0, 0010061B3B0, 000FFFFCBBC, 00000000000) +006000491C0 001005BE0F6 (00000000001, 004FF961F00, 001800539C3, 0010064BF60) +006000491C0 001005CB504 (00000000020, 001802D7900, 00180047AD6, 00180046AF0) +000FFFFCCB0 00180047B47 (00000000000, 00000000000, 00000000000, 00000000000) +00000000000 001800457C3 (00000000000, 00000000000, 00000000000, 00000000000) +End of stack trace (more stack frames may be present)