Skip to content

Commit 6e3533f

Browse files
carlossanlopcarlossanlop
authored
Merge branch 'release/6.0-staging' into merge/release/6.0-to-release/6.0-staging
2 parents 77c249b + b9c7e8b commit 6e3533f

File tree

84 files changed

+5963
-5727
lines changed

Some content is hidden

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

84 files changed

+5963
-5727
lines changed

‎NuGet.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
1212
<add key="darc-pub-dotnet-emsdk-ab8bc4e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ab8bc4e2/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-8601068" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-86010681/nuget/v3/index.json" />
1314
<!-- End: Package sources from dotnet-emsdk -->
1415
<!-- Begin: Package sources from dotnet-wcf -->
1516
<!-- End: Package sources from dotnet-wcf -->

‎docs/design/features/dotnet-pgo.md‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,13 @@
11
# dotnet-pgo Spec
22
Utilize trace data for improving application performance
33

4-
NOTE: This documentation page contains information on some features that are still work-in-progress.
5-
64
## Intro
75

86
The dotnet-pgo tool is a cross-platform CLI global tool that enables conversion of traces of .NET Core applications collected via dotnet-trace, ETW, perfview, perfcollect, LTTNG to be used to improve the performance of an application or library.
97

108
## Installing dotnet-pgo
119

12-
The first step is to install the dotnet-pgo CLI global tool.
13-
14-
```cmd
15-
$ dotnet tool install --global dotnet-pgo
16-
You can invoke the tool using the following command: dotnet-pgo
17-
Tool 'dotnet-pgo' (version '6.0.47001') was successfully installed.
18-
```
10+
The only way to use dotnet-pgo is to build it in the runtime repo. To learn how to build the runtime, consult the [how to build](https://github.com/dotnet/runtime/tree/main/docs/workflow/building/coreclr) docs for Windows, macOS, or Linux.
1911

2012
## Using dotnet-pgo to optimize an application
2113

@@ -37,14 +29,14 @@ set COMPLUS_TC_QuickJitForLoops=1
3729
set COMPLUS_TC_CallCountThreshold=10000
3830
set COMPLUS_ReadyToRun=0
3931
40-
dotnet-trace collect --providers Microsoft-Windows-DotNETRuntime:0x1E000080018:4 -- bin\Release\net6.0\pgotest.exe
32+
dotnet-trace collect --providers Microsoft-Windows-DotNETRuntime:0x1E000080018:4 -- bin\Release\net{version-number-goes-here}.0\pgotest.exe
4133
4234
set COMPLUS_TieredPGO=
4335
set COMPLUS_TC_QuickJitForLoops=
4436
set COMPLUS_TC_CallCountThreshold=
4537
set COMPLUS_ReadyToRun=
4638
47-
dotnet-pgo create-mibc --trace trace.nettrace --output trace.mibc
39+
${YOUR-REPO-ROOT}\artifacts\bin\coreclr\{OS}.{ARCHITECTURE}.{CONFIGURATION}\dotnet-pgo create-mibc --trace trace.nettrace --output trace.mibc
4840
4941
dotnet publish --runtime win-x64 -p:PublishReadyToRun=true -p:ReadyToRunOptimizationData=trace.mibc
5042
```

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24269.3">
3+
<Dependency Name="Microsoft.NETCore.Runtime.ICU.Transport" Version="6.0.0-rtm.24315.1">
44
<Uri>https://github.com/dotnet/icu</Uri>
5-
<Sha>def3524876b6b84a72e8ed02db6077f9c0ce8a75</Sha>
5+
<Sha>20d255e341e98186edf70b24aa52fdd81797cc51</Sha>
66
</Dependency>
77
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-servicing.22205.1">
88
<Uri>https://github.com/dotnet/msquic</Uri>

‎eng/Versions.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<MicrosoftNETILLinkTasksVersion>6.0.100-1.21459.1</MicrosoftNETILLinkTasksVersion>
163163
<MicrosoftNETILLinkAnalyzerPackageVersion>$(MicrosoftNETILLinkTasksVersion)</MicrosoftNETILLinkAnalyzerPackageVersion>
164164
<!-- ICU -->
165-
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.24269.3</MicrosoftNETCoreRuntimeICUTransportVersion>
165+
<MicrosoftNETCoreRuntimeICUTransportVersion>6.0.0-rtm.24315.1</MicrosoftNETCoreRuntimeICUTransportVersion>
166166
<!-- MsQuic -->
167167
<SystemNetMsQuicTransportVersion>6.0.0-servicing.22205.1</SystemNetMsQuicTransportVersion>
168168
<!-- Mono LLVM -->

‎eng/pipelines/common/build-coreclr-and-libraries-job.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ parameters:
77
container: ''
88
testGroup: ''
99
crossBuild: false
10-
crossrootfsDir: ''
1110
timeoutInMinutes: ''
1211
signBinaries: false
1312
stagedBuild: false
@@ -27,7 +26,6 @@ jobs:
2726
container: ${{ parameters.container }}
2827
testGroup: ${{ parameters.testGroup }}
2928
crossBuild: ${{ parameters.crossBuild }}
30-
crossrootfsDir: ${{ parameters.crossrootfsDir }}
3129
timeoutInminutes: ${{ parameters.timeoutInMinutes }}
3230
signBinaries: ${{ parameters.signBinaries }}
3331
stagedBuild: ${{ parameters.stagedBuild }}
@@ -46,7 +44,6 @@ jobs:
4644
container: ${{ parameters.container }}
4745
testGroup: ${{ parameters.testGroup }}
4846
crossBuild: ${{ parameters.crossBuild }}
49-
crossrootfsDir: ${{ parameters.crossrootfsDir }}
5047
timeoutInminutes: ${{ parameters.timeoutInMinutes }}
5148
variables: ${{ parameters.variables }}
5249
pool: ${{ parameters.pool }}

‎eng/pipelines/common/global-build-job.yml‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ parameters:
77
osSubgroup: ''
88
container: ''
99
crossBuild: false
10-
crossrootfsDir: ''
1110
variables: []
1211
targetRid: ''
1312
timeoutInMinutes: ''
@@ -29,6 +28,7 @@ parameters:
2928
enableRichCodeNavigation: false
3029
richCodeNavigationLanguage: 'csharp'
3130
richCodeNavigationEnvironment: 'production'
31+
preBuildSteps: []
3232

3333
jobs:
3434
- template: /eng/common/templates/job/job.yml
@@ -64,6 +64,8 @@ jobs:
6464

6565
- name: _osParameter
6666
value: -os ${{ parameters.osGroup }}
67+
- name: _archParameter
68+
value: -arch ${{ parameters.archType }}
6769

6870
- ${{ if and(eq(parameters.osGroup, 'Linux'), eq(parameters.osSubGroup, '_musl')) }}:
6971
- name: _osParameter
@@ -170,12 +172,36 @@ jobs:
170172
- script: $(Build.SourcesDirectory)\eng\common\init-tools-native.cmd -InstallDirectory $(Build.SourcesDirectory)\native-tools -Force
171173
displayName: Install native dependencies
172174

175+
- ${{ if ne(parameters.preBuildSteps,'') }}:
176+
- ${{ each preBuildStep in parameters.preBuildSteps }}:
177+
- ${{ if ne(preBuildStep.template, '') }}:
178+
- template: ${{ preBuildStep.template }}
179+
parameters:
180+
osGroup: ${{ parameters.osGroup }}
181+
osSubgroup: ${{ parameters.osSubgroup }}
182+
archType: ${{ parameters.archType }}
183+
buildConfig: ${{ parameters.buildConfig }}
184+
runtimeFlavor: ${{ parameters.runtimeFlavor }}
185+
runtimeVariant: ${{ parameters.runtimeVariant }}
186+
helixQueues: ${{ parameters.helixQueues }}
187+
targetRid: ${{ parameters.targetRid }}
188+
nameSuffix: ${{ parameters.nameSuffix }}
189+
platform: ${{ parameters.platform }}
190+
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
191+
${{ if ne(preBuildStep.forwardedParameters, '') }}:
192+
${{ each parameter in preBuildStep.forwardedParameters }}:
193+
${{ parameter }}: ${{ parameters[parameter] }}
194+
${{ if ne(preBuildStep.parameters, '') }}:
195+
${{ insert }}: ${{ preBuildStep.parameters }}
196+
- ${{ else }}:
197+
- ${{ preBuildStep }}
198+
173199
# Build
174-
- ${{ if eq(parameters.buildingOnSourceBuildImage, false) }}:
175-
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci -arch ${{ parameters.archType }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)
176-
displayName: Build product
177-
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
178-
continueOnError: ${{ parameters.shouldContinueOnError }}
200+
- template: /eng/pipelines/common/templates/global-build-step.yml
201+
parameters:
202+
buildArgs: ${{ parameters.buildArgs }}
203+
useContinueOnErrorDuringBuild: ${{ parameters.useContinueOnErrorDuringBuild }}
204+
shouldContinueOnError: ${{ parameters.shouldContinueOnError }}
179205

180206
- ${{ if in(parameters.osGroup, 'OSX', 'iOS', 'tvOS', 'Android') }}:
181207
- script: |

‎eng/pipelines/common/platform-matrix.yml‎

Lines changed: 14 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,7 @@ jobs:
3737
archType: arm
3838
targetRid: linux-arm
3939
platform: Linux_arm
40-
container:
41-
image: ubuntu-16.04-cross-20210719121212-8a8d3be
42-
registry: mcr
40+
container: Linux_arm
4341
jobParameters:
4442
runtimeFlavor: ${{ parameters.runtimeFlavor }}
4543
stagedBuild: ${{ parameters.stagedBuild }}
@@ -48,7 +46,6 @@ jobs:
4846
platforms: ${{ parameters.platforms }}
4947
helixQueueGroup: ${{ parameters.helixQueueGroup }}
5048
crossBuild: true
51-
crossrootfsDir: '/crossrootfs/arm'
5249
${{ insert }}: ${{ parameters.jobParameters }}
5350

5451
# Linux arm64
@@ -63,9 +60,7 @@ jobs:
6360
archType: arm64
6461
targetRid: linux-arm64
6562
platform: Linux_arm64
66-
container:
67-
image: ubuntu-16.04-cross-arm64-20210719121212-8a8d3be
68-
registry: mcr
63+
container: Linux_arm64
6964
jobParameters:
7065
runtimeFlavor: ${{ parameters.runtimeFlavor }}
7166
stagedBuild: ${{ parameters.stagedBuild }}
@@ -74,7 +69,6 @@ jobs:
7469
platforms: ${{ parameters.platforms }}
7570
helixQueueGroup: ${{ parameters.helixQueueGroup }}
7671
crossBuild: true
77-
crossrootfsDir: '/crossrootfs/arm64'
7872
${{ insert }}: ${{ parameters.jobParameters }}
7973

8074
# Linux musl x64
@@ -90,9 +84,7 @@ jobs:
9084
archType: x64
9185
targetRid: linux-musl-x64
9286
platform: Linux_musl_x64
93-
container:
94-
image: alpine-3.13-WithNode-20210910135845-c401c85
95-
registry: mcr
87+
container: Linux_musl_x64
9688
jobParameters:
9789
runtimeFlavor: ${{ parameters.runtimeFlavor }}
9890
stagedBuild: ${{ parameters.stagedBuild }}
@@ -115,9 +107,7 @@ jobs:
115107
archType: arm
116108
targetRid: linux-musl-arm
117109
platform: Linux_musl_arm
118-
container:
119-
image: ubuntu-16.04-cross-arm-alpine-20210719121212-044d5b9
120-
registry: mcr
110+
container: Linux_musl_arm
121111
jobParameters:
122112
runtimeFlavor: ${{ parameters.runtimeFlavor }}
123113
stagedBuild: ${{ parameters.stagedBuild }}
@@ -126,7 +116,6 @@ jobs:
126116
platforms: ${{ parameters.platforms }}
127117
helixQueueGroup: ${{ parameters.helixQueueGroup }}
128118
crossBuild: true
129-
crossrootfsDir: '/crossrootfs/arm'
130119
${{ insert }}: ${{ parameters.jobParameters }}
131120

132121
# Linux musl arm64
@@ -142,9 +131,7 @@ jobs:
142131
archType: arm64
143132
targetRid: linux-musl-arm64
144133
platform: Linux_musl_arm64
145-
container:
146-
image: ubuntu-16.04-cross-arm64-alpine-20210719121212-b2c2436
147-
registry: mcr
134+
container: Linux_musl_arm64
148135
jobParameters:
149136
runtimeFlavor: ${{ parameters.runtimeFlavor }}
150137
stagedBuild: ${{ parameters.stagedBuild }}
@@ -153,7 +140,6 @@ jobs:
153140
platforms: ${{ parameters.platforms }}
154141
helixQueueGroup: ${{ parameters.helixQueueGroup }}
155142
crossBuild: true
156-
crossrootfsDir: '/crossrootfs/arm64'
157143
${{ insert }}: ${{ parameters.jobParameters }}
158144

159145
# Linux x64
@@ -168,9 +154,7 @@ jobs:
168154
archType: x64
169155
targetRid: linux-x64
170156
platform: Linux_x64
171-
container:
172-
image: centos-7-20210714125435-9b5bbc2
173-
registry: mcr
157+
container: Linux_x64
174158
jobParameters:
175159
runtimeFlavor: ${{ parameters.runtimeFlavor }}
176160
stagedBuild: ${{ parameters.stagedBuild }}
@@ -192,9 +176,7 @@ jobs:
192176
archType: x64
193177
targetRid: linux-x64
194178
platform: Linux_x64
195-
container:
196-
image: centos-7-source-build-20210714125450-5d87b80
197-
registry: mcr
179+
container: SourceBuild_Linux_x64
198180
jobParameters:
199181
runtimeFlavor: ${{ parameters.runtimeFlavor }}
200182
stagedBuild: ${{ parameters.stagedBuild }}
@@ -217,9 +199,7 @@ jobs:
217199
archType: s390x
218200
targetRid: linux-s390x
219201
platform: Linux_s390x
220-
container:
221-
image: ubuntu-18.04-cross-s390x-20201102145728-d6e0352
222-
registry: mcr
202+
container: Linux_s390x
223203
jobParameters:
224204
runtimeFlavor: ${{ parameters.runtimeFlavor }}
225205
stagedBuild: ${{ parameters.stagedBuild }}
@@ -228,7 +208,6 @@ jobs:
228208
platforms: ${{ parameters.platforms }}
229209
helixQueueGroup: ${{ parameters.helixQueueGroup }}
230210
crossBuild: true
231-
crossrootfsDir: '/crossrootfs/s390x'
232211
${{ insert }}: ${{ parameters.jobParameters }}
233212

234213
# WebAssembly
@@ -244,9 +223,7 @@ jobs:
244223
archType: wasm
245224
targetRid: browser-wasm
246225
platform: Browser_wasm
247-
container:
248-
image: ubuntu-18.04-webassembly-20210531091624-f5c7a43
249-
registry: mcr
226+
container: Browser_wasm
250227
jobParameters:
251228
runtimeFlavor: ${{ parameters.runtimeFlavor }}
252229
stagedBuild: ${{ parameters.stagedBuild }}
@@ -287,15 +264,12 @@ jobs:
287264
archType: x64
288265
targetRid: freebsd-x64
289266
platform: FreeBSD_x64
290-
container:
291-
image: ubuntu-18.04-cross-freebsd-11-20200407092345-a84b0d2
292-
registry: mcr
267+
container: FreeBSD_x64
293268
jobParameters:
294269
runtimeFlavor: ${{ parameters.runtimeFlavor }}
295270
buildConfig: ${{ parameters.buildConfig }}
296271
helixQueueGroup: ${{ parameters.helixQueueGroup }}
297272
crossBuild: true
298-
crossrootfsDir: '/crossrootfs/x64'
299273
${{ if eq(parameters.passPlatforms, true) }}:
300274
platforms: ${{ parameters.platforms }}
301275
${{ insert }}: ${{ parameters.jobParameters }}
@@ -312,9 +286,7 @@ jobs:
312286
archType: x64
313287
targetRid: android-x64
314288
platform: Android_x64
315-
container:
316-
image: ubuntu-18.04-android-20200422191843-e2c3f83
317-
registry: mcr
289+
container: Linux_bionic
318290
jobParameters:
319291
runtimeFlavor: mono
320292
stagedBuild: ${{ parameters.stagedBuild }}
@@ -336,9 +308,7 @@ jobs:
336308
archType: x86
337309
targetRid: android-x86
338310
platform: Android_x86
339-
container:
340-
image: ubuntu-18.04-android-20200422191843-e2c3f83
341-
registry: mcr
311+
container: Linux_bionic
342312
jobParameters:
343313
runtimeFlavor: mono
344314
stagedBuild: ${{ parameters.stagedBuild }}
@@ -360,9 +330,7 @@ jobs:
360330
archType: arm
361331
targetRid: android-arm
362332
platform: Android_arm
363-
container:
364-
image: ubuntu-18.04-android-20200422191843-e2c3f83
365-
registry: mcr
333+
container: Linux_bionic
366334
jobParameters:
367335
runtimeFlavor: mono
368336
stagedBuild: ${{ parameters.stagedBuild }}
@@ -384,9 +352,7 @@ jobs:
384352
archType: arm64
385353
targetRid: android-arm64
386354
platform: Android_arm64
387-
container:
388-
image: ubuntu-18.04-android-20200422191843-e2c3f83
389-
registry: mcr
355+
container: Linux_bionic
390356
jobParameters:
391357
runtimeFlavor: mono
392358
stagedBuild: ${{ parameters.stagedBuild }}

‎eng/pipelines/common/templates/global-build-step.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
parameters:
2+
buildArgs: ''
3+
useContinueOnErrorDuringBuild: false
4+
shouldContinueOnError: false
5+
archParameter: $(_archParameter)
6+
displayName: Build product
7+
8+
steps:
9+
- script: $(_sclEnableCommand) $(Build.SourcesDirectory)$(dir)build$(scriptExt) -ci ${{ parameters.archParameter }} $(_osParameter) ${{ parameters.buildArgs }} $(_officialBuildParameter) $(_crossBuildPropertyArg) $(_cxx11Parameter) $(_richCodeNavigationParam) $(_buildDarwinFrameworksParameter)
10+
displayName: ${{ parameters.displayName }}
11+
${{ if eq(parameters.useContinueOnErrorDuringBuild, true) }}:
12+
continueOnError: ${{ parameters.shouldContinueOnError }}

0 commit comments

Comments
 (0)