Skip to content

Commit c9150ca

Browse files
authored
Merge feature/9.x to release/9.x (#6359)
2 parents daf0e28 + 61bd085 commit c9150ca

File tree

94 files changed

+1339
-1239
lines changed

Some content is hidden

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

94 files changed

+1339
-1239
lines changed

.config/tsaoptions.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"instanceUrl": "https://devdiv.visualstudio.com/",
33
"template": "TFSDEVDIV",
44
"projectName": "DEVDIV",
5-
"areaPath": "DevDiv\\NET Runtime\\Diagnostics\\SDL",
5+
"areaPath": "DevDiv\\VS Diagnostics\\Production Diagnostics\\Dotnet Monitor",
66
"iterationPath": "DevDiv",
7-
"notificationAliases": [ "clrdiag-sdl@microsoft.com" ],
8-
"repositoryName": "diagnostics",
9-
"codebaseName": "diagnostics"
10-
}
7+
"notificationAliases": [ "dotnetmonitorsdl@microsoft.com" ],
8+
"repositoryName": "dotnet-dotnet-monitor",
9+
"codebaseName": "dotnet-dotnet-monitor"
10+
}

.github/releases.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
]
7575
},
7676
"9.0": {
77-
"tag": "v9.0.0-preview.1.24106.4",
78-
"minorReleaseDate": "2024-02-13T00:00:00.000Z",
79-
"patchReleaseDate": "2024-02-13T00:00:00.000Z",
77+
"tag": "v9.0.0-preview.2.24155.3",
78+
"minorReleaseDate": "2024-03-12T00:00:00.000Z",
79+
"patchReleaseDate": "2024-03-12T00:00:00.000Z",
8080
"supportedFrameworks": [
8181
"net9.0"
8282
]

.github/workflows/spellcheck.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,23 @@ jobs:
1717
with:
1818
persist-credentials: false
1919

20-
- uses: streetsidesoftware/cspell-action@214db1e3138f326d33b7a6a51c92852e89ab0618
20+
- uses: streetsidesoftware/cspell-action@ca4bb065dd09aca9c90c935f7dc9bb625985226c
2121
name: Documentation spellcheck
2222
if: ${{ !cancelled() }}
2323
with:
2424
files: '**/*.md'
2525
inline: error
2626
incremental_files_only: true
2727

28-
- uses: streetsidesoftware/cspell-action@214db1e3138f326d33b7a6a51c92852e89ab0618
28+
- uses: streetsidesoftware/cspell-action@ca4bb065dd09aca9c90c935f7dc9bb625985226c
2929
name: Resx spellcheck
3030
if: ${{ !cancelled() }}
3131
with:
3232
files: 'src/**/*.resx'
3333
inline: error
3434
incremental_files_only: true
3535

36-
- uses: streetsidesoftware/cspell-action@214db1e3138f326d33b7a6a51c92852e89ab0618
36+
- uses: streetsidesoftware/cspell-action@ca4bb065dd09aca9c90c935f7dc9bb625985226c
3737
name: Source code spellcheck
3838
if: ${{ !cancelled() }}
3939
with:

.github/workflows/submit-linter-suggestions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@ jobs:
4949
# The default artifact download action doesn't support cross-workflow
5050
# artifacts, so use a 3rd party one.
5151
- name: 'Download linting results'
52-
uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67
52+
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
5353
with:
5454
workflow: ${{env.workflow_name}}
5555
run_id: ${{github.event.workflow_run.id }}
5656
name: pr-linter
5757
path: ./pr-linter
5858

5959
- name: 'Setup reviewdog'
60-
uses: reviewdog/action-setup@1d18b2938261447f64c39f831d7395e90ef5a40e
60+
uses: reviewdog/action-setup@3f401fe1d58fe77e10d665ab713057375e39b887
6161

6262
# Manually supply the triggering PR event information since when a PR is from a fork,
6363
# this workflow running in the base repo will not be given information about it.

.github/workflows/submit-to-do-issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
# The default artifact download action doesn't support cross-workflow
3636
# artifacts, so use a 3rd party one.
3737
- name: 'Download linting results'
38-
uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67
38+
uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
3939
with:
4040
workflow: ${{env.workflow_name}}
4141
run_id: ${{github.event.workflow_run.id }}

.github/workflows/verify-dependabot-clearly-defined.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- name: Fetch Dependabot metadata
1616
id: metadata
17-
uses: dependabot/fetch-metadata@c9c4182bf1b97f5224aee3906fd373f6b61b4526
17+
uses: dependabot/fetch-metadata@0fb21704c18a42ce5aa8d720ea4b912f5e6babef
1818

1919
- name: Check ClearlyDefined
2020
if: ${{steps.metadata.outputs.package-ecosystem == 'nuget'}}

documentation/release-process.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
## Prepare the release branch
77

8-
1. Update the [internal pipeline](https://dev.azure.com/dnceng/internal/_build?definitionId=954) variables to prevent consumption of nightly builds into dotnet-docker. Set `NightlyUpdateDockerFromMain` variable to `false` on the pipeline itself, not just on a new build.
8+
1. Update the [internal pipeline](https://dev.azure.com/dnceng/internal/_build?definitionId=954) variables to prevent consumption of nightly builds into dotnet-docker. Update `AutoUpdateDockerBranches` variable on the pipeline itself, not just on a new build, to the list of branch references (e.g. `refs/heads/main`) that you want to automatically update dotnet/dotnet-docker when scheduled builds are run; likely want to clear the variable when preparing for release.
99
1. Merge from the `main` branch to the appropriate release branch (e.g. `release/5.0`). Note that for patch releases, fixes should be made directly to the appropriate release branch and we do not merge from the `main` branch. Note that it is acceptable to use a release/major.x branch. Alternatively, you can create a new release branch for the minor version. See [additional branch steps](#additional-steps-when-creating-a-new-release-branch) below.
1010
1. Review and merge in any outstanding dependabot PRs for the release branch.
1111
1. Run the [Update release version](https://github.com/dotnet/dotnet-monitor/actions/workflows/update-release-version.yml) workflow, setting `Use workflow from` to the release branch and correctly setting the `Release type` and `Release version` options. (*NOTE:* Release version should include only major.minor.patch, without any extra labels). Review and merge in the PR created by this workflow.
@@ -127,7 +127,7 @@ The release image is `mcr.microsoft.com/dotnet/monitor`. The tag list is https:/
127127

128128
## After the Release
129129

130-
1. Change the `NightlyUpdateDockerFromMain` variable to `true` in the [internal pipeline](https://dev.azure.com/dnceng/internal/_build?definitionId=954) to begin the consumption of nightly builds into dotnet-docker. Note this should not necessarily be done right after the release, but after the merge from main to nightly in the dotnet-docker repo (such as https://github.com/dotnet/dotnet-docker/pull/4741).
130+
1. Update the `AutoUpdateDockerBranches` variable to `refs/heads/main` in the [internal pipeline](https://dev.azure.com/dnceng/internal/_build?definitionId=954) to begin the consumption of nightly builds into dotnet-docker. Note this should not necessarily be done right after the release, but after the merge from main to nightly in the dotnet-docker repo (such as https://github.com/dotnet/dotnet-docker/pull/4741). Include additional branch references and semi-colon delimit each value e.g. `refs/heads/main;refs/heads/feature/9.x`.
131131
1. Review and merge the automatically create `Register new release information` PR.
132132
1. For each release, push its corresponding tag to the `shipped/v<version>` branch in the [internal repository](https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet-monitor) e.g `v8.0.0-rc.1.23458.6 -> shipped/v8.0`. If done correctly, this should be a fast-forward merge.
133133
1. When necessary, update this document if its instructions were unclear or incorrect.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Today we are releasing the next official preview version of the `dotnet monitor` tool. This release includes:
2+
3+
- ⚠️ Replace SwaggerUI and SwaggerScope option with OpenAPI document ([#6146](https://github.com/dotnet/dotnet-monitor/pull/6146))
4+
- 🔬 Update `POST /parameters` to support stopping after a certain number of times parameters are captured. ([#6060](https://github.com/dotnet/dotnet-monitor/pull/6060))
5+
6+
\*⚠️ **_indicates a breaking change_** \
7+
\*🔬 **_indicates an experimental feature_**
8+
9+
If you would like to provide additional feedback to the team [please fill out this survey](https://aka.ms/dotnet-monitor-survey?src=rn).

documentation/releases.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525

2626
| Version | Release Date | Latest Version | Runtime Frameworks |
2727
| --- | --- | --- | --- |
28-
| 9.0 | February 13, 2024 | [9.0.0 preview 1](https://github.com/dotnet/dotnet-monitor/releases/tag/v9.0.0-preview.1.24106.4) | net9.0 |
28+
| 9.0 | March 12, 2024 | [9.0.0 preview 2](https://github.com/dotnet/dotnet-monitor/releases/tag/v9.0.0-preview.2.24155.3) | net9.0 |
2929

3030

dotnet-monitor.yml

Lines changed: 0 additions & 162 deletions
This file was deleted.

0 commit comments

Comments
 (0)