Merge remote-tracking branch 'origin/main' into feature/10.0

Author: github-actions[bot]

.github/releases.json

@@ -35,17 +35,17 @@
       "outOfSupportDate": "2025-05-11T00:00:00.000Z"
     },
     "9.0": {
-      "tag": "v9.0.3",
+      "tag": "v9.0.4",
       "minorReleaseDate": "2024-11-12T00:00:00.000Z",
-      "patchReleaseDate": "2025-05-13T00:00:00.000Z",
+      "patchReleaseDate": "2025-08-06T00:00:00.000Z",
       "supportedFrameworks": [
         "net9.0"
       ]
     },
     "8.1": {
-      "tag": "v8.1.1",
+      "tag": "v8.1.2",
       "minorReleaseDate": "2025-02-11T00:00:00.000Z",
-      "patchReleaseDate": "2025-05-14T00:00:00.000Z",
+      "patchReleaseDate": "2025-08-06T00:00:00.000Z",
       "supportedFrameworks": [
         "net8.0"
       ]

.vscode/settings.json

@@ -29,7 +29,6 @@
     "omnisharp.enableAsyncCompletion": true,
     "omnisharp.enableEditorConfigSupport": true,
     "omnisharp.enableRoslynAnalyzers": true,
-    "omnisharp.organizeImportsOnFormat": true,
     "omnisharp.autoStart": true,
 
     // ms-vscode.powershell settings
@@ -47,5 +46,6 @@
         "xml",
         "msbuild",
         "javascript"
-    ]
+    ],
+    "dotnet.formatting.organizeImportsOnFormat": true
 }

documentation/releaseNotes/releaseNotes.v8.1.2.md

@@ -0,0 +1,7 @@
+Today we are releasing the 8.1.2 build of the `dotnet monitor` tool. This release includes:
+
+- Updated dependencies
+
+
+
+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/releaseNotes/releaseNotes.v9.0.4.md

@@ -0,0 +1,7 @@
+Today we are releasing the 9.0.4 build of the `dotnet monitor` tool. This release includes:
+
+- Updated dependencies
+
+
+
+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

@@ -4,8 +4,8 @@
 
 | Version | Original Release Date | Latest Patch Version | Patch Release Date | End of Support | Runtime Frameworks |
 | --- | --- | --- | --- | --- | --- |
-| 9.0 | November 12, 2024 | [9.0.3](https://github.com/dotnet/dotnet-monitor/releases/tag/v9.0.3) | May 13, 2025 |  | net9.0 |
-| 8.1 | February 11, 2025 | [8.1.1](https://github.com/dotnet/dotnet-monitor/releases/tag/v8.1.1) | May 14, 2025 |  | net8.0 |
+| 9.0 | November 12, 2024 | [9.0.4](https://github.com/dotnet/dotnet-monitor/releases/tag/v9.0.4) | August 6, 2025 |  | net9.0 |
+| 8.1 | February 11, 2025 | [8.1.2](https://github.com/dotnet/dotnet-monitor/releases/tag/v8.1.2) | August 6, 2025 |  | net8.0 |
 
 
 ## Out of support versions

eng/common/core-templates/job/job.yml

@@ -19,7 +19,6 @@ parameters:
   # publishing defaults
   artifacts: ''
   enableMicrobuild: false
-  enableMicrobuildForMacAndLinux: false
   microbuildUseESRP: true
   enablePublishBuildArtifacts: false
   enablePublishBuildAssets: false
@@ -125,11 +124,21 @@ jobs:
       - ${{ preStep }}
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
-    - template: /eng/common/core-templates/steps/install-microbuild.yml
-      parameters:
-        enableMicrobuild: ${{ parameters.enableMicrobuild }}
-        enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
-        microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
+    - ${{ if eq(parameters.enableMicrobuild, 'true') }}:
+      - task: MicroBuildSigningPlugin@4
+        displayName: Install MicroBuild plugin
+        inputs:
+          signType: $(_SignType)
+          zipSources: false
+          feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
+          ${{ if eq(parameters.microbuildUseESRP, true) }}:
+            ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+              ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
+            ${{ else }}:
+              ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
+        env:
+          TeamName: $(_TeamName)
+          MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
         continueOnError: ${{ parameters.continueOnError }}
 
   - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:

eng/common/post-build/publish-using-darc.ps1

@@ -6,8 +6,7 @@ param(
   [Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
   [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
   [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
-  [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
+  [Parameter(Mandatory=$false)][string] $RequireDefaultChannels
 )
 
 try {
@@ -40,10 +39,6 @@ try {
     $optionalParams.Add("--default-channels-required") | Out-Null
   }
 
-  if ("true" -eq $SkipAssetsPublishing) {
-    $optionalParams.Add("--skip-assets-publishing") | Out-Null
-  }
-
   & $darc add-build-to-channel `
     --id $buildId `
     --publishing-infra-version $PublishingInfraVersion `

eng/dependabot/independent/Versions.props

@@ -6,7 +6,7 @@
     <AzureIdentityVersion>1.14.2</AzureIdentityVersion>
     <AzureStorageBlobsVersion>12.25.0</AzureStorageBlobsVersion>
     <AzureStorageQueuesVersion>12.23.0</AzureStorageQueuesVersion>
-    <MicrosoftIdentityWebVersion>3.11.0</MicrosoftIdentityWebVersion>
+    <MicrosoftIdentityWebVersion>3.12.0</MicrosoftIdentityWebVersion>
     <MicrosoftOpenApiReadersVersion>1.6.24</MicrosoftOpenApiReadersVersion>
     <SystemPrivateUriVersion>4.3.2</SystemPrivateUriVersion>
     <SystemSecurityPrincipalWindowsVersion>5.0.0</SystemSecurityPrincipalWindowsVersion>

eng/dependabot/net9.0/Versions.props

@@ -2,16 +2,16 @@
   <!-- Import references updated by Dependabot. -->
   <PropertyGroup>
     <!-- Microsoft.Extensions.Configuration.Abstractions -->
-    <MicrosoftExtensionsConfigurationAbstractions90Version>9.0.7</MicrosoftExtensionsConfigurationAbstractions90Version>
+    <MicrosoftExtensionsConfigurationAbstractions90Version>9.0.8</MicrosoftExtensionsConfigurationAbstractions90Version>
     <!-- Microsoft.Extensions.Logging -->
-    <MicrosoftExtensionsLogging90Version>9.0.7</MicrosoftExtensionsLogging90Version>
+    <MicrosoftExtensionsLogging90Version>9.0.8</MicrosoftExtensionsLogging90Version>
     <!-- Microsoft.Extensions.Logging.Abstractions -->
-    <MicrosoftExtensionsLoggingAbstractions90Version>9.0.7</MicrosoftExtensionsLoggingAbstractions90Version>
+    <MicrosoftExtensionsLoggingAbstractions90Version>9.0.8</MicrosoftExtensionsLoggingAbstractions90Version>
     <!-- Microsoft.Extensions.Logging.Console -->
-    <MicrosoftExtensionsLoggingConsole90Version>9.0.7</MicrosoftExtensionsLoggingConsole90Version>
+    <MicrosoftExtensionsLoggingConsole90Version>9.0.8</MicrosoftExtensionsLoggingConsole90Version>
     <!-- Microsoft.NETCore.App -->
     <MicrosoftNETCoreApp90Version>9.0.4</MicrosoftNETCoreApp90Version>
     <!-- System.Text.Json -->
-    <SystemTextJson90Version>9.0.7</SystemTextJson90Version>
+    <SystemTextJson90Version>9.0.8</SystemTextJson90Version>
   </PropertyGroup>
 </Project>