Skip to content

Commit

Permalink
Various fixes from master (#554)
Browse files Browse the repository at this point in the history
Verbose logging for symbol publish

Change to stable version (no preview tag)

Fix product version string and update docs

Remove source link disabling

Display internal SOS status with sosstatus command

Add dumpvc to dotnet-dump/lldb commands.

Remove reductant dotnet-dump error message when SOS command fails.

Fixes issues:

    #511
    #508
    #509

Change SyncBlk test not to run on xplat.

Fallback to portable PDB support if getting the module's metadata importer fails.

Both Windows and Portable PDBs are published.

Change to Windows PDB for SOS.NETCore.dll in sos symbol zip file

Publish Microsoft.Diagnostics.TestHelpers, DebugServices, Repl and RuntimeClient symbols

Update symstore to 1.0.50701.

Switch to BYOC pools
  • Loading branch information
mikem8361 authored Oct 11, 2019
1 parent 64b4d9f commit 0adfc03
Show file tree
Hide file tree
Showing 21 changed files with 342 additions and 218 deletions.
28 changes: 15 additions & 13 deletions .vsts-dotnet-ci.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
phases:
trigger:
- master
- release/*

pr:
- master
- release/*

jobs:
- template: /eng/build.yml
parameters:
name: Windows
agentOs: Windows_NT
queue:
name: Hosted VS2017
parallel: 2
osGroup: Windows_NT
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -17,11 +23,9 @@ phases:
- template: /eng/build.yml
parameters:
name: CentOS_7
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343
queue:
name: Hosted Ubuntu 1604
parallel: 2
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -33,10 +37,8 @@ phases:
- template: /eng/build.yml
parameters:
name: MacOS
agentOs: Darwin
queue:
name: Hosted macOS
parallel: 2
osGroup: MacOS
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand Down
91 changes: 43 additions & 48 deletions .vsts-dotnet.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
phases:
trigger:
- master
- release/*

pr:
- master
- release/*

jobs:
- template: /eng/build.yml
parameters:
name: Windows
agentOs: Windows_NT
queue:
name: Hosted VS2017
parallel: 4
osGroup: Windows_NT
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
_BuildArch: x64
Build_Release:
_BuildConfig: Release
_BuildArch: x64
Expand All @@ -23,11 +32,9 @@ phases:
- template: /eng/build.yml
parameters:
name: CentOS_7
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343
queue:
name: Hosted Ubuntu 1604
parallel: 2
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -41,11 +48,10 @@ phases:
- template: /eng/build.yml
parameters:
name: Linux_cross
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-1735d26-20190521133857
crossrootfsDir: '/crossrootfs/arm'
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Release:
_BuildConfig: Release
Expand All @@ -55,11 +61,10 @@ phases:
- template: /eng/build.yml
parameters:
name: Linux_cross64
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921
crossrootfsDir: '/crossrootfs/arm64'
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Release:
_BuildConfig: Release
Expand All @@ -69,10 +74,9 @@ phases:
- template: /eng/build.yml
parameters:
name: Alpine3_6
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-WithNode-f4d3fe3-20181220200247
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Release:
_BuildConfig: Release
Expand All @@ -82,10 +86,8 @@ phases:
- template: /eng/build.yml
parameters:
name: MacOS
agentOs: Darwin
queue:
name: Hosted macOS
parallel: 2
osGroup: MacOS
strategy:
matrix:
Build_Release:
_BuildConfig: Release
Expand All @@ -97,12 +99,11 @@ phases:
- template: /eng/build.yml
parameters:
name: Debian_Stretch
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-3e800f1-20190521154431
dependsOn: CentOS_7
testOnly: true
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -111,12 +112,11 @@ phases:
- template: /eng/build.yml
parameters:
name: Fedora_28
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-09ca40b-20190508143249
dependsOn: CentOS_7
testOnly: true
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -125,12 +125,11 @@ phases:
- template: /eng/build.yml
parameters:
name: Fedora_29
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-09ca40b-20190508143249
dependsOn: CentOS_7
testOnly: true
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -139,12 +138,11 @@ phases:
- template: /eng/build.yml
parameters:
name: OpenSuse_42_1
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-42.1-c103199-20180628122439
dependsOn: CentOS_7
testOnly: true
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -153,12 +151,11 @@ phases:
- template: /eng/build.yml
parameters:
name: OpenSuse_42_3
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-42.3-3e800f1-20190501005344
dependsOn: CentOS_7
testOnly: true
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -167,12 +164,11 @@ phases:
- template: /eng/build.yml
parameters:
name: Ubuntu_14_04
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-1735d26-20190521133852
dependsOn: CentOS_7
testOnly: true
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -181,12 +177,11 @@ phases:
- template: /eng/build.yml
parameters:
name: Ubuntu_16_04
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-09ca40b-20190520220842
dependsOn: CentOS_7
testOnly: true
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand All @@ -195,12 +190,11 @@ phases:
- template: /eng/build.yml
parameters:
name: Ubuntu_18_04
agentOs: Linux
osGroup: Linux
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-3e800f1-20190508143252
dependsOn: CentOS_7
testOnly: true
queue:
name: Hosted Ubuntu 1604
strategy:
matrix:
Build_Debug:
_BuildConfig: Debug
Expand Down Expand Up @@ -306,6 +300,7 @@ phases:
- script: $(Build.SourcesDirectory)\eng\cipack.cmd
-configuration Release
-prepareMachine
-verbosity normal
/p:TeamName=$(_TeamName)
/p:DotNetSignType=$(SignType)
/p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
Expand All @@ -325,10 +320,10 @@ phases:
arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet -configuration Release -verbosity detailed
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
/p:BlobBasePath='$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping'
/p:PDBArtifactsDirectory='$(Build.SourcesDirectory)/artifacts/SymStore/**'
/p:BlobBasePath='$(Build.SourcesDirectory)/artifacts/packages/Release/**'
continueOnError: true
condition: and(succeeded(), eq(variables['PublishSymbols'], 'true'))

# Publish package and log build artifacts

- task: PublishBuildArtifacts@1
Expand Down
3 changes: 2 additions & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<!-- Opt-out repo features -->
<UsingToolXliff>false</UsingToolXliff>
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>

<!-- Build tools -->
<MicrosoftNetCompilersVersion>3.0.0</MicrosoftNetCompilersVersion>
Expand All @@ -22,7 +23,7 @@
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>

<!-- Other libs -->
<MicrosoftSymbolStoreVersion>1.0.41901</MicrosoftSymbolStoreVersion>
<MicrosoftSymbolStoreVersion>1.0.50701</MicrosoftSymbolStoreVersion>
<MicrosoftDiagnosticsRuntimeVersion>1.1.46104</MicrosoftDiagnosticsRuntimeVersion>
<MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
<MicrosoftDiagnosticsTracingTraceEventVersion>2.0.44</MicrosoftDiagnosticsTracingTraceEventVersion>
Expand Down
Loading

0 comments on commit 0adfc03

Please sign in to comment.