Skip to content

Commit f3ffe27

Browse files
authored
Merge pull request #2316 from dotnet/main
Merge main into release/stable
2 parents 2ee978c + 44610b8 commit f3ffe27

File tree

154 files changed

+5128
-1729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

154 files changed

+5128
-1729
lines changed

THIRD-PARTY-NOTICES.TXT

+24
Original file line numberDiff line numberDiff line change
@@ -298,3 +298,27 @@ This set of code is covered by the following license:
298298
See the License for the specific language governing permissions and
299299
limitations under the License.
300300

301+
-------------------------------------------------
302+
Boost Software License - Version 1.0 - August 17th, 2003
303+
304+
Permission is hereby granted, free of charge, to any person or organization
305+
obtaining a copy of the software and accompanying documentation covered by
306+
this license (the "Software") to use, reproduce, display, distribute,
307+
execute, and transmit the Software, and to prepare derivative works of the
308+
Software, and to permit third-parties to whom the Software is furnished to
309+
do so, all subject to the following:
310+
311+
The copyright notices in the Software and this entire statement, including
312+
the above license grant, this restriction and the following disclaimer,
313+
must be included in all copies of the Software, in whole or in part, and
314+
all derivative works of the Software, unless such copies or derivative
315+
works are solely in the form of machine-executable object code generated by
316+
a source language processor.
317+
318+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
319+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
320+
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
321+
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
322+
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
323+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
324+
DEALINGS IN THE SOFTWARE.

diagnostics.sln

+44
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "inc", "inc", "{BE45F03E-D70
186186
src\SOS\inc\lldbservices.h = src\SOS\inc\lldbservices.h
187187
src\SOS\inc\remotememoryservice.h = src\SOS\inc\remotememoryservice.h
188188
src\SOS\inc\runtime.h = src\SOS\inc\runtime.h
189+
src\SOS\inc\specialthreadinfo.h = src\SOS\inc\specialthreadinfo.h
189190
src\SOS\inc\symbolservice.h = src\SOS\inc\symbolservice.h
190191
src\SOS\inc\target.h = src\SOS\inc\target.h
191192
EndProjectSection
@@ -200,6 +201,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Diagnostics.Debug
200201
EndProject
201202
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExitCodeTracee", "src\tests\ExitCodeTracee\ExitCodeTracee.csproj", "{61F73DD0-F346-4D7A-AB12-63415B4EEEE1}"
202203
EndProject
204+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-dsrouter", "src\Tools\dotnet-dsrouter\dotnet-dsrouter.csproj", "{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}"
205+
EndProject
203206
Global
204207
GlobalSection(SolutionConfigurationPlatforms) = preSolution
205208
Checked|Any CPU = Checked|Any CPU
@@ -1617,6 +1620,46 @@ Global
16171620
{61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
16181621
{61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
16191622
{61F73DD0-F346-4D7A-AB12-63415B4EEEE1}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
1623+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|Any CPU.ActiveCfg = Debug|Any CPU
1624+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|Any CPU.Build.0 = Debug|Any CPU
1625+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|ARM.ActiveCfg = Debug|Any CPU
1626+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|ARM.Build.0 = Debug|Any CPU
1627+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|ARM64.ActiveCfg = Debug|Any CPU
1628+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|ARM64.Build.0 = Debug|Any CPU
1629+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|x64.ActiveCfg = Debug|Any CPU
1630+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|x64.Build.0 = Debug|Any CPU
1631+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|x86.ActiveCfg = Debug|Any CPU
1632+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Checked|x86.Build.0 = Debug|Any CPU
1633+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1634+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
1635+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|ARM.ActiveCfg = Debug|Any CPU
1636+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|ARM.Build.0 = Debug|Any CPU
1637+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|ARM64.ActiveCfg = Debug|Any CPU
1638+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|ARM64.Build.0 = Debug|Any CPU
1639+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|x64.ActiveCfg = Debug|Any CPU
1640+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|x64.Build.0 = Debug|Any CPU
1641+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|x86.ActiveCfg = Debug|Any CPU
1642+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Debug|x86.Build.0 = Debug|Any CPU
1643+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
1644+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|Any CPU.Build.0 = Release|Any CPU
1645+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|ARM.ActiveCfg = Release|Any CPU
1646+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|ARM.Build.0 = Release|Any CPU
1647+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|ARM64.ActiveCfg = Release|Any CPU
1648+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|ARM64.Build.0 = Release|Any CPU
1649+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|x64.ActiveCfg = Release|Any CPU
1650+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|x64.Build.0 = Release|Any CPU
1651+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|x86.ActiveCfg = Release|Any CPU
1652+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.Release|x86.Build.0 = Release|Any CPU
1653+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
1654+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
1655+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|ARM.ActiveCfg = Release|Any CPU
1656+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|ARM.Build.0 = Release|Any CPU
1657+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|ARM64.ActiveCfg = Release|Any CPU
1658+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|ARM64.Build.0 = Release|Any CPU
1659+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
1660+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
1661+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
1662+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
16201663
EndGlobalSection
16211664
GlobalSection(SolutionProperties) = preSolution
16221665
HideSolutionNode = FALSE
@@ -1668,6 +1711,7 @@ Global
16681711
{5FC66A16-41E9-4D22-A44C-FEBB7DCCAAF8} = {19FAB78C-3351-4911-8F0C-8C6056401740}
16691712
{064BC7DD-D44C-400E-9215-7546E092AB98} = {03479E19-3F18-49A6-910A-F5041E27E7C0}
16701713
{61F73DD0-F346-4D7A-AB12-63415B4EEEE1} = {03479E19-3F18-49A6-910A-F5041E27E7C0}
1714+
{2BD55143-B102-4FEC-84AD-DC3B330FA9AC} = {B62728C8-1267-4043-B46F-5537BBAEC692}
16711715
EndGlobalSection
16721716
GlobalSection(ExtensibilityGlobals) = postSolution
16731717
SolutionGuid = {46465737-C938-44FC-BE1A-4CE139EBB5E0}

diagnostics.yml

+32-104
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,18 @@ stages:
7575
displayName: Build and Test Diagnostics
7676
jobs:
7777

78+
############################
79+
# #
80+
# Source Build legs #
81+
# #
82+
############################
83+
84+
- template: /eng/common/templates/job/source-build.yml
85+
parameters:
86+
platform:
87+
name: Complete
88+
buildScript: ./eng/common/build.sh
89+
7890
############################
7991
# #
8092
# Build legs #
@@ -131,6 +143,7 @@ stages:
131143
name: Alpine3_6
132144
osGroup: Linux
133145
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.6-WithNode-f4d3fe3-20181220200247
146+
artifactsTargetPath: bin/Linux-musl.x64.Release
134147
strategy:
135148
matrix:
136149
Build_Release:
@@ -161,6 +174,7 @@ stages:
161174
parameters:
162175
name: MacOS_cross
163176
osGroup: MacOS_cross
177+
buildAndSkipTest: true
164178
strategy:
165179
matrix:
166180
Build_Release:
@@ -179,10 +193,10 @@ stages:
179193
osGroup: Linux
180194
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-14.04-cross-1735d26-20190521133857
181195
crossrootfsDir: '/crossrootfs/arm'
196+
buildAndSkipTest: true
182197
strategy:
183198
matrix:
184199
Build_Release:
185-
_BuildOnly: true
186200
_BuildConfig: Release
187201
_BuildArch: arm
188202
_PublishArtifacts: bin/Linux.arm.Release
@@ -193,10 +207,10 @@ stages:
193207
osGroup: Linux
194208
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-a3ae44b-20180315221921
195209
crossrootfsDir: '/crossrootfs/arm64'
210+
buildAndSkipTest: true
196211
strategy:
197212
matrix:
198213
Build_Release:
199-
_BuildOnly: true
200214
_BuildConfig: Release
201215
_BuildArch: arm64
202216
_PublishArtifacts: bin/Linux.arm64.Release
@@ -207,10 +221,11 @@ stages:
207221
osGroup: Linux
208222
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-16.04-cross-arm64-alpine-406629a-20200127195039
209223
crossrootfsDir: '/crossrootfs/arm64'
224+
artifactsTargetPath: bin/Linux-musl.arm64.Release
225+
buildAndSkipTest: true
210226
strategy:
211227
matrix:
212228
Build_Release:
213-
_BuildOnly: true
214229
_BuildConfig: Release
215230
_BuildArch: arm64
216231
_PublishArtifacts: bin/Linux.arm64.Release
@@ -242,6 +257,7 @@ stages:
242257
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-09ca40b-20190508143249
243258
dependsOn: CentOS_7
244259
testOnly: true
260+
requiresCapPtraceContainer: true
245261
strategy:
246262
matrix:
247263
Build_Debug:
@@ -255,6 +271,7 @@ stages:
255271
dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-29-09ca40b-20190508143249
256272
dependsOn: CentOS_7
257273
testOnly: true
274+
requiresCapPtraceContainer: true
258275
strategy:
259276
matrix:
260277
Build_Debug:
@@ -314,7 +331,6 @@ stages:
314331
_BuildArch: x64
315332

316333
# Download, sign, package and publish
317-
318334
- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
319335
- template: /eng/common/templates/job/job.yml
320336
parameters:
@@ -332,122 +348,34 @@ stages:
332348
condition: succeeded()
333349
pool:
334350
name: NetCoreInternal-Pool
335-
queue: BuildPool.Windows.10.Amd64.VS2017
351+
queue: BuildPool.Windows.10.Amd64.VS2019
336352
enablePublishUsingPipelines: true
337353
enableMicrobuild: true
338354
artifacts:
339355
publish:
340356
logs:
341357
name: Logs_Packaging_Signing
342358
steps:
343-
344-
# Windows x64 download. Everything under "bin" is published for the Windows x64 build.
345-
346-
- task: DownloadPipelineArtifact@2
347-
displayName: Download Windows x64 and Managed Artifacts
348-
inputs:
349-
artifactName: Windows_x64_Release
350-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin'
351-
condition: succeeded()
352-
353-
# Windows x86 download
354-
355-
- task: DownloadPipelineArtifact@2
356-
displayName: Download Windows x86 Artifacts
357-
inputs:
358-
artifactName: Windows_x86_Release
359-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/Windows_NT.x86.Release'
360-
condition: succeeded()
361-
362-
# Windows arm download
363-
364-
- task: DownloadPipelineArtifact@2
365-
displayName: Download Windows Arm Artifacts
366-
inputs:
367-
artifactName: Windows_arm_Release
368-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/Windows_NT.arm.Release'
369-
condition: succeeded()
370-
371-
# Windows arm64 download
372-
373-
- task: DownloadPipelineArtifact@2
374-
displayName: Download Windows Arm64 Artifacts
375-
inputs:
376-
artifactName: Windows_arm64_Release
377-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/Windows_NT.arm64.Release'
378-
condition: succeeded()
379-
380-
# Linux x64 download
381-
382-
- task: DownloadPipelineArtifact@2
383-
displayName: Download Linux Artifacts
384-
inputs:
385-
artifactName: CentOS_7_x64_Release
386-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/Linux.x64.Release'
387-
condition: succeeded()
388-
389-
# Linux MUSL x64 download
390-
391-
- task: DownloadPipelineArtifact@2
392-
displayName: Download Linux Musl Artifacts
393-
inputs:
394-
artifactName: Alpine3_6_x64_Release
395-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/Linux-musl.x64.Release'
396-
condition: succeeded()
397-
398-
# Linux arm download
399-
400-
- task: DownloadPipelineArtifact@2
401-
displayName: Download Linux Arm Artifacts
402-
inputs:
403-
artifactName: Linux_cross_arm_Release
404-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/Linux.arm.Release'
405-
condition: succeeded()
406-
407-
# Linux arm64 download
408-
409-
- task: DownloadPipelineArtifact@2
410-
displayName: Download Linux Arm64 Artifacts
359+
- task: DownloadBuildArtifacts@0
360+
displayName: 'Download release builds'
411361
inputs:
412-
artifactName: Linux_cross64_arm64_Release
413-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/Linux.arm64.Release'
414-
condition: succeeded()
415-
416-
# Linux MUSL arm64 download
417-
418-
- task: DownloadPipelineArtifact@2
419-
displayName: Download Linux Musl arm64 Artifacts
420-
inputs:
421-
artifactName: Alpine3_6_cross64_arm64_Release
422-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/Linux-musl.arm64.Release'
423-
condition: succeeded()
424-
425-
# MacOS download
426-
427-
- task: DownloadPipelineArtifact@2
428-
displayName: Download MacOS Artifacts
362+
downloadPath: '$(Build.ArtifactStagingDirectory)/__download__'
363+
artifactName: Build_Release
364+
checkDownloadedFiles: true
365+
- task: CopyFiles@2
366+
displayName: 'Binplace Product'
429367
inputs:
430-
artifactName: MacOS_x64_Release
431-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/OSX.x64.Release'
432-
condition: succeeded()
433-
434-
# MacOS arm64 download
435-
436-
- task: DownloadPipelineArtifact@2
437-
displayName: Download MacOS arm64 Artifacts
438-
inputs:
439-
artifactName: MacOS_cross_arm64_Release
440-
targetPath: '$(Build.SourcesDirectory)/artifacts/bin/OSX.arm64.Release'
441-
condition: succeeded()
368+
sourceFolder: $(Build.ArtifactStagingDirectory)/__download__/Build_Release
369+
targetFolder: '$(Build.SourcesDirectory)/artifacts/'
442370

371+
# Windows x64 download. Everything under "bin" is published for the Windows x64 build.
443372
# Create nuget packages, sign binaries and publish to blob feed
444373
- script: $(Build.SourcesDirectory)\eng\ci-prepare-artifacts.cmd $(_InternalBuildArgs)
445374
displayName: Package, Sign, and Publish
446375
continueOnError: false
447376
condition: succeeded()
448377

449378
# Publish package and log build artifacts
450-
451379
- task: PublishBuildArtifacts@1
452380
displayName: Publish Package Artifacts
453381
inputs:
@@ -473,7 +401,7 @@ stages:
473401
publishUsingPipelines: true
474402
pool:
475403
name: NetCoreInternal-Pool
476-
queue: buildpool.windows.10.amd64.vs2017
404+
queue: buildpool.windows.10.amd64.vs2019
477405

478406
- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
479407
- template: /eng/common/templates/post-build/post-build.yml

documentation/design-docs/dotnet-tools.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ For analyzing CPU usage, IO, lock contention, allocation rate, etc the investiga
4949

5050
**Convert a trace to use with speedscope**
5151

52-
> dotnet trace convert ~/trace.nettrace --to-speedscope
52+
> dotnet trace convert ~/trace.nettrace --format Speedscope
5353
Writing: ~/trace.speedscope.json
5454
Conversion complete
5555

eng/CIBuild.cmd

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" -restore -test -ci %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0build.ps1""" -restore -ci -prepareMachine %*"
33
exit /b %ErrorLevel%

eng/Signing.props

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
Condition="'$(SignFilesToBundle)' == 'true'" />
1313

1414
<ItemGroup>
15-
<FileSignInfo Include="ParallelStacks.Runtime.dll" CertificateName="3PartySHA2" />
1615
<FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
1716
<FileSignInfo Include="Newtonsoft.Json.Bson.dll" CertificateName="3PartySHA2" />
1817
</ItemGroup>

0 commit comments

Comments
 (0)