Skip to content

Download symbols in lldb/sos and for portable PDBs on Windows/dbgeng. #101

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikem8361 merged 3 commits into from
Dec 13, 2018
Merged

Download symbols in lldb/sos and for portable PDBs on Windows/dbgeng. #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1bf4845
Download symbols in lldb/sos and for portable PDBs on Windows/dbgeng.
Nov 27, 2018
6af8ad0
Workaround problem in IXCLRDataModule Request that crashes on dynamic
Dec 13, 2018
e92bff9
Turn off verbose logging.
Dec 13, 2018
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: 7 additions & 7 deletions .vsts-dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ phases:
- agent.os -equals Windows_NT
variables:
_PublishBlobFeedUrl: https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json
_SOSNETCorePath: $(Build.SourcesDirectory)/artifacts/bin/SOS.NETCore/Release/netcoreapp1.0
_SOSNETCorePath: $(Build.SourcesDirectory)/artifacts/bin/SOS.NETCore/Release/netcoreapp2.0/publish
_TeamName: DotNetCore

steps:
Expand Down Expand Up @@ -265,7 +265,7 @@ phases:
displayName: Copy Windows x64 Artifacts
inputs:
sourceFolder: '$(_SOSNETCorePath)'
contents: 'SOS.NETCore.dll'
contents: '*.dll'
overWrite: true
targetFolder: '$(Build.SourcesDirectory)/artifacts/Windows_NT.x64.Release'
condition: succeeded()
Expand Down Expand Up @@ -300,7 +300,7 @@ phases:
displayName: Copy Windows x86 Artifacts
inputs:
sourceFolder: '$(_SOSNETCorePath)'
contents: 'SOS.NETCore.dll'
contents: '*.dll'
overWrite: true
targetFolder: '$(Build.SourcesDirectory)/artifacts/bin/Windows_NT.x86.Release'
condition: succeeded()
Expand Down Expand Up @@ -328,7 +328,7 @@ phases:
displayName: Copy Extension Gallery Files
inputs:
sourceFolder: '$(_SOSNETCorePath)'
contents: 'SOS.NETCore.dll'
contents: '*.dll'
overWrite: true
targetFolder: '$(Build.SourcesDirectory)/artifacts/bin/gallery/x64'
condition: succeeded()
Expand All @@ -345,7 +345,7 @@ phases:
displayName: Copy Extension Gallery Files
inputs:
sourceFolder: '$(_SOSNETCorePath)'
contents: 'SOS.NETCore.dll'
contents: '*.dll'
overWrite: true
targetFolder: '$(Build.SourcesDirectory)/artifacts/bin/gallery/x86'
condition: succeeded()
Expand Down Expand Up @@ -388,7 +388,7 @@ phases:
displayName: Copy Linux Artifacts
inputs:
sourceFolder: '$(_SOSNETCorePath)'
contents: 'SOS.NETCore.dll'
contents: '*.dll'
overWrite: true
targetFolder: '$(Build.SourcesDirectory)/artifacts/bin/Linux.x64.Release'
condition: succeeded()
Expand Down Expand Up @@ -423,7 +423,7 @@ phases:
displayName: Copy MacOS Artifacts
inputs:
sourceFolder: '$(_SOSNETCorePath)'
contents: 'SOS.NETCore.dll'
contents: '*.dll'
overWrite: true
targetFolder: '$(Build.SourcesDirectory)/artifacts/bin/OSX.x64.Release'
condition: succeeded()
Expand Down
310 changes: 302 additions & 8 deletions diagnostics.sln
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,19 @@
<MicrosoftNetCompilersVersion>2.8.0-beta6-62830-08</MicrosoftNetCompilersVersion>

<!-- CoreFX -->
<SystemReflectionMetadataVersion>1.5.0</SystemReflectionMetadataVersion>
<SystemReflectionMetadataVersion>1.6.0</SystemReflectionMetadataVersion>
<SystemCollectionsImmutableVersion>1.5.0</SystemCollectionsImmutableVersion>
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>

<!-- Other libs -->
<MicrosoftSymbolStoreVersion>1.0.0-dev-63604-01</MicrosoftSymbolStoreVersion>
</PropertyGroup>

<PropertyGroup>
<RestoreSources>
$(RestoreSources);
https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
https://dotnet.myget.org/F/symstore/api/v3/index.json;
https://dotnet.myget.org/F/dotnet-core/api/v3/index.json;
https://dotnet.myget.org/F/dotnet-buildtools/api/v3/index.json
</RestoreSources>
Expand Down
5 changes: 5 additions & 0 deletions src/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project>
<Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<Target Name="_PublishPackageReferences"
AfterTargets="PostBuildEvent"
Condition="$(IsPublishable) == 'true'"
DependsOnTargets="$(_BeforePublishNoBuildTargets);$(_CorePublishTargets)" />
</Project>
10 changes: 7 additions & 3 deletions src/SOS/SOS.NETCore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
project(SOS.NETCore)

if(NOT ${CLR_MANAGED_BINARY_DIR} STREQUAL "")
set(MANAGED_BINDIR ${CLR_MANAGED_BINARY_DIR}/SOS.NETCore/${CLR_BUILD_TYPE}/netcoreapp1.0)
set(MANAGED_BINDIR ${CLR_MANAGED_BINARY_DIR}/SOS.NETCore/${CLR_BUILD_TYPE}/netcoreapp2.0/publish)

install(FILES ${MANAGED_BINDIR}/SOS.NETCore.dll DESTINATION .)
install(FILES ${MANAGED_BINDIR}/SOS.NETCore.pdb DESTINATION .)
install(FILES ${MANAGED_BINDIR}/SOS.NETCore.dll DESTINATION . )
install(FILES ${MANAGED_BINDIR}/SOS.NETCore.pdb DESTINATION . )
install(FILES ${MANAGED_BINDIR}/Microsoft.FileFormats.dll DESTINATION . )
install(FILES ${MANAGED_BINDIR}/Microsoft.SymbolStore.dll DESTINATION . )
install(FILES ${MANAGED_BINDIR}/System.Reflection.Metadata.dll DESTINATION . )
install(FILES ${MANAGED_BINDIR}/System.Collections.Immutable.dll DESTINATION . )
endif()
14 changes: 8 additions & 6 deletions src/SOS/SOS.NETCore/SOS.NETCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,27 @@
<!-- Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -->
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp1.0</TargetFramework>
<TargetFramework>netcoreapp2.0</TargetFramework>
<AssemblyName>SOS.NETCore</AssemblyName>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<NoWarn>;1591;1701</NoWarn>
<IsPackable>true</IsPackable>
<IsPublishable>true</IsPublishable>
<Description>.NET Core SOS</Description>
<PackageId>SOS</PackageId>
<PackageReleaseNotes>$(Description)</PackageReleaseNotes>
<PackageTags>SOS</PackageTags>
<IncludeBuildOutput>false</IncludeBuildOutput>
<SOSNETCorePath>$(ArtifactsBinDir)\SOS.NETCore\$(Configuration)\netcoreapp1.0\SOS.NETCore.dll</SOSNETCorePath>
<SOSNETCoreBinaries>$(ArtifactsBinDir)\SOS.NETCore\$(Configuration)\netcoreapp2.0\publish\*.dll</SOSNETCoreBinaries>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="System.Reflection.Metadata" Version="$(SystemReflectionMetadataVersion)" />
<PackageReference Include="Microsoft.SymbolStore" Version="$(MicrosoftSymbolStoreVersion)" />
</ItemGroup>

<ItemGroup>
<_PackageFiles Include="$(SOSNETCorePath)">
<_PackageFiles Include="$(SOSNETCoreBinaries)">
<BuildAction>None</BuildAction>
<PackagePath>tools/win-x64</PackagePath>
</_PackageFiles>
Expand All @@ -28,7 +30,7 @@
<PackagePath>tools/win-x64</PackagePath>
</_PackageFiles>

<_PackageFiles Include="$(SOSNETCorePath)">
<_PackageFiles Include="$(SOSNETCoreBinaries)">
<BuildAction>None</BuildAction>
<PackagePath>tools/win-x86</PackagePath>
</_PackageFiles>
Expand All @@ -37,7 +39,7 @@
<PackagePath>tools/win-x86</PackagePath>
</_PackageFiles>

<_PackageFiles Include="$(SOSNETCorePath)">
<_PackageFiles Include="$(SOSNETCoreBinaries)">
<BuildAction>None</BuildAction>
<PackagePath>tools/linux-x64</PackagePath>
</_PackageFiles>
Expand All @@ -54,7 +56,7 @@
<PackagePath>tools/linux-x64</PackagePath>
</_PackageFiles>

<_PackageFiles Include="$(SOSNETCorePath)">
<_PackageFiles Include="$(SOSNETCoreBinaries)">
<BuildAction>None</BuildAction>
<PackagePath>tools/osx-x64</PackagePath>
</_PackageFiles>
Expand Down
Loading