[Rollout] Production rollout 2026-05-05 (#6262)

#6261

## Checklist
- [ ] Verify this PR contains the expected changes
- [ ] Follow the rollout process in issue #6261
- [ ] ⚠️ **DO NOT SQUASH** when merging - use merge commit

Author: dkurepa

.config/dotnet-tools.json

@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "microsoft.dnceng.secretmanager": {
-      "version": "1.1.0-beta.26216.2",
+      "version": "1.1.0-beta.26230.1",
       "commands": [
         "secret-manager"
       ]
     },
     "dotnet-ef": {
-      "version": "10.0.3",
+      "version": "10.0.7",
       "commands": [
         "dotnet-ef"
       ]
     },
     "microsoft.dnceng.configuration.bootstrap": {
-      "version": "1.1.0-beta.26216.2",
+      "version": "1.1.0-beta.26230.1",
       "commands": [
         "bootstrap-dnceng-configuration"
       ]

.github/dependabot.yml

@@ -9,7 +9,3 @@ updates:
     directory: "/"
     schedule:
       interval: "weekly"
-    groups:
-      all-dependencies:
-        patterns:
-        - "*"

Directory.Packages.props

@@ -10,11 +10,11 @@
     <PackageVersion Include="Aspire.Hosting.Azure.Storage" Version="13.1.2" />
     <PackageVersion Include="Aspire.Hosting.Azure" Version="13.1.2" />
     <PackageVersion Include="Aspire.Hosting.Redis" Version="13.1.2" />
-    <PackageVersion Include="Azure.Core" Version="1.51.1" />
+    <PackageVersion Include="Azure.Core" Version="1.53.0" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.4.0" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.5.1" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.DataProtection.Keys" Version="1.6.1" />
-    <PackageVersion Include="Azure.Identity" Version="1.17.1" />
+    <PackageVersion Include="Azure.Identity" Version="1.21.0" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.4.0" />
     <PackageVersion Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.6.0" />
     <PackageVersion Include="Azure.ResourceManager.AppContainers" Version="1.5.0" />
@@ -29,14 +29,15 @@
     <PackageVersion Include="Microsoft.AspNetCore.ApiPagination" Version="$(MicrosoftAspNetCoreApiPaginationVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.ApiVersioning.Swashbuckle" Version="$(MicrosoftAspNetCoreApiVersioningSwashbuckleVersion)" />
     <PackageVersion Include="Microsoft.AspNetCore.ApiVersioning" Version="$(MicrosoftAspNetCoreApiVersioningVersion)" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Azure.StackExchangeRedis" Version="3.3.1" />
-    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.3.3" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.3.3" />
+    <PackageVersion Include="Microsoft.Build.Tasks.Core" Version="18.4.0" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.4.0" />
     <PackageVersion Include="Microsoft.Build" Version="18.0.2" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.4" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="7.0.1" />
+    <PackageVersion Include="Microsoft.Data.SqlClient.Extensions.Azure" Version="1.0.0" />
     <PackageVersion Include="Microsoft.DncEng.Configuration.Extensions" Version="$(MicrosoftDncEngConfigurationExtensionsVersion)" />
     <PackageVersion Include="Microsoft.DotNet.GitHub.Authentication" Version="$(MicrosoftDotNetGitHubAuthenticationVersion)" />
     <PackageVersion Include="Microsoft.DotNet.Internal.DependencyInjection.Testing" Version="$(MicrosoftDotNetInternalDependencyInjectionTestingVersion)" />
@@ -49,24 +50,24 @@
     <PackageVersion Include="Microsoft.DotNet.Services.Utility" Version="$(MicrosoftDotNetServicesUtilityVersion)" />
     <PackageVersion Include="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="$(MicrosoftDotNetSwaggerGeneratorMSBuildVersion)" />
     <PackageVersion Include="Microsoft.DotNet.VersionTools" Version="$(MicrosoftDotNetVersionToolsVersion)" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="10.0.7" />
     <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.Abstractions" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.3" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.FileSystemGlobbing" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.2.0" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="10.5.0" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.23.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.2" />
-    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.7" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="10.2.0" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.13.2" />
     <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.13.2" />
@@ -76,7 +77,8 @@
     <PackageVersion Include="Moq" Version="4.18.4" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="NRedisStack" Version="0.12.0" />
-    <PackageVersion Include="NuGet.Packaging" Version="7.3.1" />
+    <!-- Intentionally pinned for VMR bootstrap compatibility; only upgrade once bootstrap supports newer NuGet.Packaging versions. -->
+    <PackageVersion Include="NuGet.Packaging" Version="7.0.3" />
     <PackageVersion Include="NUnit" Version="4.4.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
     <PackageVersion Include="Octokit" Version="14.0.0" />

docs/Darc.md

@@ -11,8 +11,7 @@ use darc to achieve them, as well as a general reference guide to darc commands.
   - [Updating dependencies in your local repository](#updating-dependencies-in-your-local-repository)
   - [Removing dependencies from a repository](#removing-dependencies-from-a-repository)
   - [Changing a dependency's type](#changing-a-dependencys-type)
-  - ['Pinning' dependencies so they do not
-    update](#pinning-dependencies-so-they-do-not-update)
+  - ['Pinning' dependencies so they do not update](#pinning-dependencies-so-they-do-not-update)
   - [Coherent parent dependencies](#coherent-parent-dependencies)
   - [Version.Details.props and the SkipProperty attribute](#versiondetailsprops-and-the-skipproperty-attribute)
   - [Adding dependency flow](#adding-dependency-flow)
@@ -22,6 +21,7 @@ use darc to achieve them, as well as a general reference guide to darc commands.
   - [Assigning an individual build to a channel](#assigning-an-individual-build-to-a-channel)
   - [Locating the BAR build ID for a build](#locating-the-bar-build-id-for-a-build)
   - [Checking Merge Policies on Github](#checking-merge-policies-on-github)
+  - [Making multiple configuration changes](#making-multiple-configuration-changes)
 
 - [Command Reference](#command-reference)
   - [Parameters](#parameters)
@@ -1129,6 +1129,63 @@ You will find them on the `Checks` tab of each updates PRs created by maestro. D
 
 ![Checks Merge Policies](ChecksMergePolicies.png)
 
+### Making multiple configuration changes
+
+The configuration management commands support a common set of parameters that allow you to combine
+multiple changes. By using `--configuration-branch` with `--no-pr`, you can stage several related
+configuration changes onto the same branch and then open a single pull request for all of them.
+
+You can either just keep supplying a constant value for `--configuration-branch` where the first call with create a pull request too and all subsequent calls with notice the branch and will pile onto the PR branch.  
+Alternatively, you can supply also `--no-pr` for the first calls if you want to stall the PR creation and only omit it on the last call to get the PR up when all changes are ready. This is somewhat faster as the tool does not need to query for the PR existence etc..
+
+This is useful when you want to make a coordinated set of changes, such as:
+
+- creating a new channel
+- adding or updating subscriptions that flow into that channel
+- updating merge policies for the affected repository and branch
+
+#### How it works
+
+1. Pick a branch name to hold your configuration changes.
+2. Run each darc command with `--configuration-branch <branch-name>`.
+3. Pass `--no-pr` on each command while you are still batching changes.
+4. On the final command, omit `--no-pr` so darc opens one PR containing all of
+   the accumulated edits.
+
+If the branch does not already exist, darc creates it from
+`--configuration-base-branch` (or `production` if not specified).
+
+#### Example
+
+The following example creates a channel, adds a subscription, and updates
+repository policies in a single PR:
+
+```powershell
+# Step 1: create or reuse a configuration branch and add the first change
+darc add-channel `
+  --name "NET 11 Preview 4" `
+  --classification preview `
+  --configuration-branch net11-preview4-config `
+  --configuration-base-branch production `
+  --no-pr
+
+# Step 2: add another change to the same configuration branch
+darc add-subscription `
+  --channel "NET 11 Preview 4" `
+  --source-repo https://github.com/dotnet/source-repo `
+  --target-repo https://github.com/dotnet/target-repo `
+  --target-branch main `
+  --update-frequency everyBuild `
+  --configuration-branch net11-preview4-config `
+  --no-pr
+
+# Step 3: make a final change and open a single PR for everything
+darc set-repository-policies `
+  --repo https://github.com/dotnet/target-repo `
+  --branch main `
+  --all-checks-passed `
+  --configuration-branch net11-preview4-config
+```
 
 ## Command Reference
 

eng/Version.Details.props

@@ -6,14 +6,14 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet-arcade dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26208.4</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26208.4</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftDotNetSignToolPackageVersion>10.0.0-beta.26208.4</MicrosoftDotNetSignToolPackageVersion>
-    <MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>10.0.0-beta.26208.4</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26222.2</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26222.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
+    <MicrosoftDotNetSignToolPackageVersion>10.0.0-beta.26222.2</MicrosoftDotNetSignToolPackageVersion>
+    <MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>10.0.0-beta.26222.2</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
     <MicrosoftDotNetVersionToolsPackageVersion>8.0.0-beta.25555.2</MicrosoftDotNetVersionToolsPackageVersion>
     <!-- dotnet-dnceng dependencies -->
-    <MicrosoftDncEngConfigurationBootstrapPackageVersion>1.1.0-beta.26216.2</MicrosoftDncEngConfigurationBootstrapPackageVersion>
-    <MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.26216.2</MicrosoftDncEngSecretManagerPackageVersion>
+    <MicrosoftDncEngConfigurationBootstrapPackageVersion>1.1.0-beta.26230.1</MicrosoftDncEngConfigurationBootstrapPackageVersion>
+    <MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.26230.1</MicrosoftDncEngSecretManagerPackageVersion>
     <!-- dotnet-dnceng-shared dependencies -->
     <MicrosoftAspNetCoreApiPaginationPackageVersion>1.1.0-beta.26214.1</MicrosoftAspNetCoreApiPaginationPackageVersion>
     <MicrosoftAspNetCoreApiVersioningPackageVersion>1.1.0-beta.26214.1</MicrosoftAspNetCoreApiVersioningPackageVersion>
@@ -29,7 +29,7 @@ This file should be imported by eng/Versions.props
     <MicrosoftDotNetKustoPackageVersion>1.1.0-beta.26214.1</MicrosoftDotNetKustoPackageVersion>
     <MicrosoftDotNetServicesUtilityPackageVersion>1.1.0-beta.26214.1</MicrosoftDotNetServicesUtilityPackageVersion>
     <!-- maestro-configuration dependencies -->
-    <MicrosoftDotNetMaestroConfigurationClientPackageVersion>1.1.0-beta.26180.1</MicrosoftDotNetMaestroConfigurationClientPackageVersion>
+    <MicrosoftDotNetMaestroConfigurationClientPackageVersion>1.1.0-beta.26224.1</MicrosoftDotNetMaestroConfigurationClientPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.xml

@@ -55,37 +55,37 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26208.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26222.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecdd5c6a7986cafabbf6a322ea09a07736a01a0d</Sha>
+      <Sha>58713cb9a664ed67642127fcaf70b8c0c3b55ef2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.26208.4">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.26222.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecdd5c6a7986cafabbf6a322ea09a07736a01a0d</Sha>
+      <Sha>58713cb9a664ed67642127fcaf70b8c0c3b55ef2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26208.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26222.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecdd5c6a7986cafabbf6a322ea09a07736a01a0d</Sha>
+      <Sha>58713cb9a664ed67642127fcaf70b8c0c3b55ef2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.26208.4">
+    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="10.0.0-beta.26222.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>ecdd5c6a7986cafabbf6a322ea09a07736a01a0d</Sha>
+      <Sha>58713cb9a664ed67642127fcaf70b8c0c3b55ef2</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25555.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>048a8c0ba5b72234301a3605c424ee9f9ff99772</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.26216.2">
+    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.26230.1">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>da634aee80eb1041dd86522bbfc408491a764cf6</Sha>
+      <Sha>17d2dbe0d14f5f67be14b62f7b9d9684c2f6c2bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.26216.2">
+    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.26230.1">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>da634aee80eb1041dd86522bbfc408491a764cf6</Sha>
+      <Sha>17d2dbe0d14f5f67be14b62f7b9d9684c2f6c2bc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.MaestroConfiguration.Client" Version="1.1.0-beta.26180.1">
+    <Dependency Name="Microsoft.DotNet.MaestroConfiguration.Client" Version="1.1.0-beta.26224.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/maestro-configuration</Uri>
-      <Sha>55b3eccfde27561c1c37499f419e8c693c5eeb30</Sha>
+      <Sha>82cfd34ff904edb0d5d0417713cc40655fe5e83b</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

global.json

@@ -1,20 +1,20 @@
 {
   "sdk": {
-    "version": "10.0.202",
+    "version": "10.0.203",
     "rollForward": "minor"
   },
   "tools": {
-    "dotnet": "10.0.202",
+    "dotnet": "10.0.203",
     "runtimes": {
       "dotnet": [
-        "10.0.6"
+        "10.0.7"
       ],
       "aspnetcore": [
-        "10.0.6"
+        "10.0.7"
       ]
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26208.4"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26222.2"
   }
 }

src/Maestro/Maestro.Common/AppCredentials/AppCredential.cs

@@ -84,8 +84,8 @@ private static CachedInteractiveBrowserCredential GetInteractiveCredential(strin
     public static AppCredential CreateManagedIdentityCredential(string appId, string managedIdentityId)
     {
         var miCredential = managedIdentityId == "system"
-            ? new ManagedIdentityCredential()
-            : new ManagedIdentityCredential(managedIdentityId);
+            ? new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned)
+            : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(managedIdentityId));
 
         var appCredential = new ClientAssertionCredential(
             TENANT_ID,

src/Maestro/Maestro.Common/AppCredentials/CredentialResolver.cs

@@ -23,8 +23,8 @@ public static TokenCredential CreateCredential(CredentialResolverOptions options
         if (!string.IsNullOrEmpty(options.ManagedIdentityId))
         {
             return options.ManagedIdentityId == "system"
-                ? new ManagedIdentityCredential()
-                : new ManagedIdentityCredential(options.ManagedIdentityId);
+                ? new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned)
+                : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(options.ManagedIdentityId));
         }
 
         // 3. Azure CLI authentication setup by the caller (for CI scenarios)

src/Maestro/Maestro.Common/AzureDevOpsTokens/AzureDevOpsTokenProvider.cs

@@ -122,8 +122,8 @@ private static Dictionary<string, TokenCredential> GetCredentials(
             if (!string.IsNullOrEmpty(option.ManagedIdentityId))
             {
                 credentials[account] = option.ManagedIdentityId == "system"
-                    ? new ManagedIdentityCredential()
-                    : new ManagedIdentityCredential(option.ManagedIdentityId);
+                    ? new ManagedIdentityCredential(ManagedIdentityId.SystemAssigned)
+                    : new ManagedIdentityCredential(ManagedIdentityId.FromUserAssignedClientId(option.ManagedIdentityId));
                 continue;
             }