WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit 0adfc03

Browse files
author
Mike McLaughlin
authored
Various fixes from master (#554)
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
1 parent 64b4d9f commit 0adfc03

File tree

21 files changed

+342
-218
lines changed

21 files changed

+342
-218
lines changed

.vsts-dotnet-ci.yml

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
phases:
1+
trigger:
2+
- master
3+
- release/*
4+
5+
pr:
6+
- master
7+
- release/*
8+
9+
jobs:
210
- template: /eng/build.yml
311
parameters:
412
name: Windows
5-
agentOs: Windows_NT
6-
queue:
7-
name: Hosted VS2017
8-
parallel: 2
13+
osGroup: Windows_NT
14+
strategy:
915
matrix:
1016
Build_Debug:
1117
_BuildConfig: Debug
@@ -17,11 +23,9 @@ phases:
1723
- template: /eng/build.yml
1824
parameters:
1925
name: CentOS_7
20-
agentOs: Linux
26+
osGroup: Linux
2127
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343
22-
queue:
23-
name: Hosted Ubuntu 1604
24-
parallel: 2
28+
strategy:
2529
matrix:
2630
Build_Debug:
2731
_BuildConfig: Debug
@@ -33,10 +37,8 @@ phases:
3337
- template: /eng/build.yml
3438
parameters:
3539
name: MacOS
36-
agentOs: Darwin
37-
queue:
38-
name: Hosted macOS
39-
parallel: 2
40+
osGroup: MacOS
41+
strategy:
4042
matrix:
4143
Build_Debug:
4244
_BuildConfig: Debug

.vsts-dotnet.yml

Lines changed: 43 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,21 @@
1-
phases:
1+
trigger:
2+
- master
3+
- release/*
4+
5+
pr:
6+
- master
7+
- release/*
8+
9+
jobs:
210
- template: /eng/build.yml
311
parameters:
412
name: Windows
5-
agentOs: Windows_NT
6-
queue:
7-
name: Hosted VS2017
8-
parallel: 4
13+
osGroup: Windows_NT
14+
strategy:
915
matrix:
16+
Build_Debug:
17+
_BuildConfig: Debug
18+
_BuildArch: x64
1019
Build_Release:
1120
_BuildConfig: Release
1221
_BuildArch: x64
@@ -23,11 +32,9 @@ phases:
2332
- template: /eng/build.yml
2433
parameters:
2534
name: CentOS_7
26-
agentOs: Linux
35+
osGroup: Linux
2736
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343
28-
queue:
29-
name: Hosted Ubuntu 1604
30-
parallel: 2
37+
strategy:
3138
matrix:
3239
Build_Debug:
3340
_BuildConfig: Debug
@@ -41,11 +48,10 @@ phases:
4148
- template: /eng/build.yml
4249
parameters:
4350
name: Linux_cross
44-
agentOs: Linux
51+
osGroup: Linux
4552
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-1735d26-20190521133857
4653
crossrootfsDir: '/crossrootfs/arm'
47-
queue:
48-
name: Hosted Ubuntu 1604
54+
strategy:
4955
matrix:
5056
Build_Release:
5157
_BuildConfig: Release
@@ -55,11 +61,10 @@ phases:
5561
- template: /eng/build.yml
5662
parameters:
5763
name: Linux_cross64
58-
agentOs: Linux
64+
osGroup: Linux
5965
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921
6066
crossrootfsDir: '/crossrootfs/arm64'
61-
queue:
62-
name: Hosted Ubuntu 1604
67+
strategy:
6368
matrix:
6469
Build_Release:
6570
_BuildConfig: Release
@@ -69,10 +74,9 @@ phases:
6974
- template: /eng/build.yml
7075
parameters:
7176
name: Alpine3_6
72-
agentOs: Linux
77+
osGroup: Linux
7378
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-WithNode-f4d3fe3-20181220200247
74-
queue:
75-
name: Hosted Ubuntu 1604
79+
strategy:
7680
matrix:
7781
Build_Release:
7882
_BuildConfig: Release
@@ -82,10 +86,8 @@ phases:
8286
- template: /eng/build.yml
8387
parameters:
8488
name: MacOS
85-
agentOs: Darwin
86-
queue:
87-
name: Hosted macOS
88-
parallel: 2
89+
osGroup: MacOS
90+
strategy:
8991
matrix:
9092
Build_Release:
9193
_BuildConfig: Release
@@ -97,12 +99,11 @@ phases:
9799
- template: /eng/build.yml
98100
parameters:
99101
name: Debian_Stretch
100-
agentOs: Linux
102+
osGroup: Linux
101103
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch-3e800f1-20190521154431
102104
dependsOn: CentOS_7
103105
testOnly: true
104-
queue:
105-
name: Hosted Ubuntu 1604
106+
strategy:
106107
matrix:
107108
Build_Debug:
108109
_BuildConfig: Debug
@@ -111,12 +112,11 @@ phases:
111112
- template: /eng/build.yml
112113
parameters:
113114
name: Fedora_28
114-
agentOs: Linux
115+
osGroup: Linux
115116
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-09ca40b-20190508143249
116117
dependsOn: CentOS_7
117118
testOnly: true
118-
queue:
119-
name: Hosted Ubuntu 1604
119+
strategy:
120120
matrix:
121121
Build_Debug:
122122
_BuildConfig: Debug
@@ -125,12 +125,11 @@ phases:
125125
- template: /eng/build.yml
126126
parameters:
127127
name: Fedora_29
128-
agentOs: Linux
128+
osGroup: Linux
129129
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-09ca40b-20190508143249
130130
dependsOn: CentOS_7
131131
testOnly: true
132-
queue:
133-
name: Hosted Ubuntu 1604
132+
strategy:
134133
matrix:
135134
Build_Debug:
136135
_BuildConfig: Debug
@@ -139,12 +138,11 @@ phases:
139138
- template: /eng/build.yml
140139
parameters:
141140
name: OpenSuse_42_1
142-
agentOs: Linux
141+
osGroup: Linux
143142
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-42.1-c103199-20180628122439
144143
dependsOn: CentOS_7
145144
testOnly: true
146-
queue:
147-
name: Hosted Ubuntu 1604
145+
strategy:
148146
matrix:
149147
Build_Debug:
150148
_BuildConfig: Debug
@@ -153,12 +151,11 @@ phases:
153151
- template: /eng/build.yml
154152
parameters:
155153
name: OpenSuse_42_3
156-
agentOs: Linux
154+
osGroup: Linux
157155
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-42.3-3e800f1-20190501005344
158156
dependsOn: CentOS_7
159157
testOnly: true
160-
queue:
161-
name: Hosted Ubuntu 1604
158+
strategy:
162159
matrix:
163160
Build_Debug:
164161
_BuildConfig: Debug
@@ -167,12 +164,11 @@ phases:
167164
- template: /eng/build.yml
168165
parameters:
169166
name: Ubuntu_14_04
170-
agentOs: Linux
167+
osGroup: Linux
171168
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-1735d26-20190521133852
172169
dependsOn: CentOS_7
173170
testOnly: true
174-
queue:
175-
name: Hosted Ubuntu 1604
171+
strategy:
176172
matrix:
177173
Build_Debug:
178174
_BuildConfig: Debug
@@ -181,12 +177,11 @@ phases:
181177
- template: /eng/build.yml
182178
parameters:
183179
name: Ubuntu_16_04
184-
agentOs: Linux
180+
osGroup: Linux
185181
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-09ca40b-20190520220842
186182
dependsOn: CentOS_7
187183
testOnly: true
188-
queue:
189-
name: Hosted Ubuntu 1604
184+
strategy:
190185
matrix:
191186
Build_Debug:
192187
_BuildConfig: Debug
@@ -195,12 +190,11 @@ phases:
195190
- template: /eng/build.yml
196191
parameters:
197192
name: Ubuntu_18_04
198-
agentOs: Linux
193+
osGroup: Linux
199194
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-3e800f1-20190508143252
200195
dependsOn: CentOS_7
201196
testOnly: true
202-
queue:
203-
name: Hosted Ubuntu 1604
197+
strategy:
204198
matrix:
205199
Build_Debug:
206200
_BuildConfig: Debug
@@ -306,6 +300,7 @@ phases:
306300
- script: $(Build.SourcesDirectory)\eng\cipack.cmd
307301
-configuration Release
308302
-prepareMachine
303+
-verbosity normal
309304
/p:TeamName=$(_TeamName)
310305
/p:DotNetSignType=$(SignType)
311306
/p:DotNetPublishBlobFeedKey=$(dotnetfeed-storage-access-key-1)
@@ -325,10 +320,10 @@ phases:
325320
arguments: -task PublishToSymbolServers -restore -msbuildEngine dotnet -configuration Release -verbosity detailed
326321
/p:DotNetSymbolServerTokenMsdl=$(microsoft-symbol-server-pat)
327322
/p:DotNetSymbolServerTokenSymWeb=$(symweb-symbol-server-pat)
328-
/p:BlobBasePath='$(Build.SourcesDirectory)/artifacts/packages/Release/NonShipping'
323+
/p:PDBArtifactsDirectory='$(Build.SourcesDirectory)/artifacts/SymStore/**'
324+
/p:BlobBasePath='$(Build.SourcesDirectory)/artifacts/packages/Release/**'
329325
continueOnError: true
330326
condition: and(succeeded(), eq(variables['PublishSymbols'], 'true'))
331-
332327
# Publish package and log build artifacts
333328

334329
- task: PublishBuildArtifacts@1

eng/Versions.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<!-- Opt-out repo features -->
1313
<UsingToolXliff>false</UsingToolXliff>
1414
<UsingToolNetFrameworkReferenceAssemblies>true</UsingToolNetFrameworkReferenceAssemblies>
15+
<UsingToolSymbolUploader>true</UsingToolSymbolUploader>
1516

1617
<!-- Build tools -->
1718
<MicrosoftNetCompilersVersion>3.0.0</MicrosoftNetCompilersVersion>
@@ -22,7 +23,7 @@
2223
<MicrosoftWin32PrimitivesVersion>4.3.0</MicrosoftWin32PrimitivesVersion>
2324

2425
<!-- Other libs -->
25-
<MicrosoftSymbolStoreVersion>1.0.41901</MicrosoftSymbolStoreVersion>
26+
<MicrosoftSymbolStoreVersion>1.0.50701</MicrosoftSymbolStoreVersion>
2627
<MicrosoftDiagnosticsRuntimeVersion>1.1.46104</MicrosoftDiagnosticsRuntimeVersion>
2728
<MicrosoftDiaSymReaderNativePackageVersion>1.7.0</MicrosoftDiaSymReaderNativePackageVersion>
2829
<MicrosoftDiagnosticsTracingTraceEventVersion>2.0.44</MicrosoftDiagnosticsTracingTraceEventVersion>

0 commit comments

Comments
 (0)