[release/9.x] Merge feature/9.x

.config/tsaoptions.json

@@ -2,9 +2,9 @@
     "instanceUrl": "https://devdiv.visualstudio.com/",
     "template": "TFSDEVDIV",
     "projectName": "DEVDIV",
-    "areaPath": "DevDiv\\NET Runtime\\Diagnostics\\SDL",
+    "areaPath": "DevDiv\\VS Diagnostics\\Production Diagnostics\\Dotnet Monitor",
     "iterationPath": "DevDiv",
-    "notificationAliases": [ "clrdiag-sdl@microsoft.com" ],
-    "repositoryName": "diagnostics",
-    "codebaseName": "diagnostics"
-  }
+    "notificationAliases": [ "dotnetmonitorsdl@microsoft.com" ],
+    "repositoryName": "dotnet-dotnet-monitor",
+    "codebaseName": "dotnet-dotnet-monitor"
+}

.github/releases.json

@@ -74,9 +74,9 @@
       ]
     },
     "9.0": {
-      "tag": "v9.0.0-preview.1.24106.4",
-      "minorReleaseDate": "2024-02-13T00:00:00.000Z",
-      "patchReleaseDate": "2024-02-13T00:00:00.000Z",
+      "tag": "v9.0.0-preview.2.24155.3",
+      "minorReleaseDate": "2024-03-12T00:00:00.000Z",
+      "patchReleaseDate": "2024-03-12T00:00:00.000Z",
       "supportedFrameworks": [
         "net9.0"
       ]

.github/workflows/spellcheck.yml

@@ -17,23 +17,23 @@ jobs:
         with:
           persist-credentials: false
 
-      - uses: streetsidesoftware/cspell-action@214db1e3138f326d33b7a6a51c92852e89ab0618
+      - uses: streetsidesoftware/cspell-action@ca4bb065dd09aca9c90c935f7dc9bb625985226c
         name: Documentation spellcheck
         if: ${{ !cancelled() }}
         with:
             files: '**/*.md'
             inline: error
             incremental_files_only: true
 
-      - uses: streetsidesoftware/cspell-action@214db1e3138f326d33b7a6a51c92852e89ab0618
+      - uses: streetsidesoftware/cspell-action@ca4bb065dd09aca9c90c935f7dc9bb625985226c
         name: Resx spellcheck
         if: ${{ !cancelled() }}
         with:
             files: 'src/**/*.resx'
             inline: error
             incremental_files_only: true
 
-      - uses: streetsidesoftware/cspell-action@214db1e3138f326d33b7a6a51c92852e89ab0618
+      - uses: streetsidesoftware/cspell-action@ca4bb065dd09aca9c90c935f7dc9bb625985226c
         name: Source code spellcheck
         if: ${{ !cancelled() }}
         with:

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

@@ -49,15 +49,15 @@ jobs:
       # The default artifact download action doesn't support cross-workflow
       # artifacts, so use a 3rd party one.
       - name: 'Download linting results'
-        uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67
+        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
         with:
           workflow: ${{env.workflow_name}}
           run_id: ${{github.event.workflow_run.id }}
           name: pr-linter
           path: ./pr-linter
 
       - name: 'Setup reviewdog'
-        uses: reviewdog/action-setup@1d18b2938261447f64c39f831d7395e90ef5a40e
+        uses: reviewdog/action-setup@3f401fe1d58fe77e10d665ab713057375e39b887
 
       # Manually supply the triggering PR event information since when a PR is from a fork,
       # this workflow running in the base repo will not be given information about it.

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

@@ -35,7 +35,7 @@ jobs:
       # The default artifact download action doesn't support cross-workflow
       # artifacts, so use a 3rd party one.
       - name: 'Download linting results'
-        uses: dawidd6/action-download-artifact@71072fbb1229e1317f1a8de6b04206afb461bd67
+        uses: dawidd6/action-download-artifact@09f2f74827fd3a8607589e5ad7f9398816f540fe
         with:
           workflow: ${{env.workflow_name}}
           run_id: ${{github.event.workflow_run.id }}

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

@@ -14,7 +14,7 @@ jobs:
     steps:
       - name: Fetch Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@c9c4182bf1b97f5224aee3906fd373f6b61b4526
+        uses: dependabot/fetch-metadata@0fb21704c18a42ce5aa8d720ea4b912f5e6babef
 
       - name: Check ClearlyDefined
         if: ${{steps.metadata.outputs.package-ecosystem == 'nuget'}}

documentation/release-process.md

@@ -5,7 +5,7 @@
 
 ## Prepare the release branch
 
-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.
+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.
 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.
 1. Review and merge in any outstanding dependabot PRs for the release branch.
 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:/
 
 ## After the Release
 
-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).
+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`.
 1. Review and merge the automatically create `Register new release information` PR.
 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.
 1. When necessary, update this document if its instructions were unclear or incorrect.

documentation/releaseNotes/releaseNotes.v9.0.0-preview.2.md

@@ -0,0 +1,9 @@
+Today we are releasing the next official preview version of the `dotnet monitor` tool. This release includes:
+
+- ⚠️ Replace SwaggerUI and SwaggerScope option with OpenAPI document ([#6146](https://github.com/dotnet/dotnet-monitor/pull/6146))
+- 🔬 Update `POST /parameters` to support stopping after a certain number of times parameters are captured. ([#6060](https://github.com/dotnet/dotnet-monitor/pull/6060))
+
+\*⚠️ **_indicates a breaking change_** \
+\*🔬 **_indicates an experimental feature_**
+
+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

@@ -25,6 +25,6 @@
 
 | Version | Release Date | Latest Version | Runtime Frameworks |
 | --- | --- | --- | --- |
-| 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 |
+| 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 |
 
 

eng/Version.Details.xml

@@ -1,66 +1,66 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.2.24128.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
+      <Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="8.0.510501">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring" Version="8.0.0-preview.24178.4">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>8c08c89a0643d31db91e119b1adb463be3e0ffe5</Sha>
+      <Sha>045a07e97ac08d34d769db53c1b28266159bcea2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="8.0.510501">
+    <Dependency Name="Microsoft.Diagnostics.Monitoring.EventPipe" Version="8.0.0-preview.24178.4">
       <Uri>https://github.com/dotnet/diagnostics</Uri>
-      <Sha>8c08c89a0643d31db91e119b1adb463be3e0ffe5</Sha>
+      <Sha>045a07e97ac08d34d769db53c1b28266159bcea2</Sha>
     </Dependency>
     <Dependency Name="System.CommandLine" Version="2.0.0-beta4.24126.1">
       <Uri>https://github.com/dotnet/command-line-api</Uri>
       <Sha>5ea97af07263ea3ef68a18557c8aa3f7e3200bda</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24151.1">
+    <Dependency Name="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0-preview.24177.1">
       <Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
-      <Sha>59b2d9dc38fcc17dd618e3b3af3ce692aaeedb37</Sha>
+      <Sha>ad732e236e7ffcb66de4b45a1b736aad4ccdcd83</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24178.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
+      <Sha>4345e14684eab24fa2f8217706756dd7c0787d84</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24151.5">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24178.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
+      <Sha>4345e14684eab24fa2f8217706756dd7c0787d84</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24151.5">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24178.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
+      <Sha>4345e14684eab24fa2f8217706756dd7c0787d84</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24178.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
+      <Sha>4345e14684eab24fa2f8217706756dd7c0787d84</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.2.24163.3">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="9.0.100-preview.4.24178.10">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>79819c38bf73d2c051080127d92e94c8e54ae953</Sha>
+      <Sha>6cb99adb7aea19d43c6af6aecae7526dfe61d763</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
+    <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24178.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
+      <Sha>4345e14684eab24fa2f8217706756dd7c0787d84</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.FileFormats" Version="1.0.511901">
+    <Dependency Name="Microsoft.FileFormats" Version="1.0.517501">
       <Uri>https://github.com/dotnet/symstore</Uri>
-      <Sha>96a152a28e86ecc5c68ec9a73e02bb1e93163338</Sha>
+      <Sha>550601c12a227c87ded32316345934101a8a2422</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.2.24128.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
+      <Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.2.24128.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24177.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
-      <Sha>e1ad9117a4dac3b0f5f2a7e2b10b43b7016379b9</Sha>
+      <Sha>1c8f20be1fc4e97044d7ca93edae3af528bc3521</Sha>
     </Dependency>
-    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.2.24128.5" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.4.24178.3" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>8e5e748c5c06d3e40244c725bd2124f06998f6c1</Sha>
+      <Sha>e612bf4d0b6f08623092902c34a504e932388664</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>