[Rollout] Production rollout 2025-01-27 (#4386)

Author: oleksandr-didyk

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "microsoft.dnceng.secretmanager": {
-      "version": "1.1.0-beta.25057.2",
+      "version": "1.1.0-beta.25071.2",
       "commands": [
         "secret-manager"
       ]
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dnceng.configuration.bootstrap": {
-      "version": "1.1.0-beta.25057.2",
+      "version": "1.1.0-beta.25071.2",
       "commands": [
         "bootstrap-dnceng-configuration"
       ]

README.md

@@ -2,7 +2,9 @@
 
 ## Overview
 
-This repo is home of the services that help us construct .NET. Mainly, you can find the Maestro dependency flow system and the Darc CLI tool.
+This repo is home of the services that help us construct .NET. Mainly, you can find the **Product Construction Service** (previously *Maestro*) dependency flow system and the Darc CLI tool.
+
+The service's main responsibility is opening and managing dependency update pull requests in .NET repositories. It is also responsible for [the code flow subscription between product repositories and the VMR](https://github.com/dotnet/arcade/blob/main/Documentation/UnifiedBuild/VMR-Full-Code-Flow.md).
 
 ## Development
 

eng/Version.Details.xml

@@ -83,13 +83,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>4db725213dccb0d1102427bce1c39ba3117da7f7</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25057.2">
+    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25071.2">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>53d0d22d1279882d461777706eef3d57275ad3cc</Sha>
+      <Sha>919c3cbb47ad56b61ba59e3f0ccf6555d4607c7e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25057.2">
+    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25071.2">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>53d0d22d1279882d461777706eef3d57275ad3cc</Sha>
+      <Sha>919c3cbb47ad56b61ba59e3f0ccf6555d4607c7e</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -32,8 +32,8 @@
     <MicrosoftDotNetMetricsVersion>1.1.0-beta.25052.1</MicrosoftDotNetMetricsVersion>
     <MicrosoftDotNetServicesUtilityVersion>1.1.0-beta.25053.1</MicrosoftDotNetServicesUtilityVersion>
     <MicrosoftDotNetWebAuthenticationVersion>1.1.0-beta.25053.1</MicrosoftDotNetWebAuthenticationVersion>
-    <MicrosoftDncEngSecretManagerVersion>1.1.0-beta.25057.2</MicrosoftDncEngSecretManagerVersion>
-    <MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.25057.2</MicrosoftDncEngConfigurationBootstrapVersion>
+    <MicrosoftDncEngSecretManagerVersion>1.1.0-beta.25071.2</MicrosoftDncEngSecretManagerVersion>
+    <MicrosoftDncEngConfigurationBootstrapVersion>1.1.0-beta.25071.2</MicrosoftDncEngConfigurationBootstrapVersion>
   </PropertyGroup>
   <!--Package names-->
   <PropertyGroup>

eng/new-issue.ps1

@@ -0,0 +1,82 @@
+### Creates an issue, assigns it to the PCS and UB projects, sets the area/size fields and opens the issue in the browser.
+### Parameters:
+###   -t, --title <string> Title of the issue
+###   -b, --body <string> Body of the issue
+###   -a, --area <Pcs|Ri|Fr> Area of the issue
+###   -s, --size <XS|S|M|L|XL|U> Size of the issue
+### Example: .\new-issue.ps1 -t Title -b Body -a Pcs -s M
+
+[CmdletBinding(PositionalBinding=$false)]
+Param(
+    [Alias('r')]
+    [Parameter(Mandatory=$false)]
+    [string]
+    $Repo = 'dotnet/arcade-services',
+
+    [Alias('t')]
+    [Parameter(Mandatory=$true)]
+    [string]
+    $Title,
+
+    [Alias('b')]
+    [Parameter(Mandatory=$false)]
+    [string]
+    $Body,
+
+    [Alias('a')]
+    [Parameter(Mandatory=$true)]
+    [ValidateSet('Pcs', 'Ri', 'Fr')]
+    [string]
+    $Area,
+
+    [Alias('s')]
+    [Parameter(Mandatory=$false)]
+    [ValidateSet('XS', 'S', 'M', 'L', 'XL', 'U')]
+    [string]
+    $Size,
+
+    [Alias('ub')]
+    [switch]
+    $UnifiedBuild
+)
+
+$ErrorActionPreference = 'Stop'
+$PSNativeCommandUseErrorActionPreference = $true
+
+$pcsProject = 276;
+$ubProject = 310;
+
+switch ($Area) {
+    'Pcs' { $areaName = 'Product Construction' }
+    'Ri' { $areaName = 'Release Infrastructure' }
+    'Fr' { $areaName = 'First Responder / Ops / Debt' }
+}
+
+function Set-ProjectProperty($projectId, $issue, $property, $value) {
+    $project = gh project view --owner dotnet --format json $projectId | ConvertFrom-Json
+    $projectItem = gh project item-add $projectId --owner dotnet --url $issue.url --format json | ConvertFrom-Json
+    $field = gh project field-list $projectId --format json --owner dotnet --jq ".fields[] | select(.name == `"$property`")" | ConvertFrom-Json
+    $option = $field.options | Where-Object { $_.name -eq $value }
+    gh project item-edit --id $projectItem.id --project-id $project.id --field-id $field.id --single-select-option-id $option.id
+}
+
+$issueUrl = gh issue create --title "$Title" --body "$Body" --repo $Repo
+Write-Host "Created issue $issueUrl"
+$issue = gh issue view $issueUrl --json id,url | ConvertFrom-Json
+
+Set-ProjectProperty $pcsProject $issue 'Area' $areaName
+
+if ($UnifiedBuild) {
+    if ($Area -eq 'Ri') {
+        $areaName = 'Release Infra'
+    }
+    
+    if ($Area -ne 'Fr') {
+        Set-ProjectProperty $ubProject $issue 'Area' $areaName
+        if ($Size) {
+            Set-ProjectProperty $ubProject $issue 'Size' $Size
+        }
+    }
+}
+
+start $issue.url

src/Maestro/Maestro.MergePolicies/AllChecksSuccessfulMergePolicy.cs

@@ -36,20 +36,17 @@ public override async Task<MergePolicyEvaluationResult> EvaluateAsync(IPullReque
             return Pending("Waiting for checks.");
         }
 
-        ILookup<CheckState, Check> statuses = notIgnoredChecks.ToLookup(
-            c =>
+        // Group check statuses to success, pending and error
+        ILookup<CheckState, Check> statuses = notIgnoredChecks.ToLookup(c =>
+            c.Status switch
             {
-                // unify the check statuses to success, pending, and error
-                return c.Status switch
-                {
-                    CheckState.Success or CheckState.Pending => c.Status,
-                    _ => CheckState.Error,
-                };
+                CheckState.Success or CheckState.Pending => c.Status,
+                _ => CheckState.Error,
             });
 
         int ListChecksCount(CheckState state)
         {
-            return statuses[state].Select(c => c.Name).Count();
+            return statuses[state].Count();
         }
 
         if (statuses.Contains(CheckState.Error))
@@ -59,15 +56,15 @@ int ListChecksCount(CheckState state)
             {
                 listChecks.AppendLine($"[{status.Name}]({status.Url})");
             }
-            return Fail($"Unsuccessful checks: {ListChecksCount(CheckState.Error)}", $"{listChecks}");
+            return Fail($"{ListChecksCount(CheckState.Error)} unsuccessful check(s)", listChecks.ToString());
         }
 
         if (statuses.Contains(CheckState.Pending))
         {
-            return Pending($"Waiting on checks: {ListChecksCount(CheckState.Pending)}");
+            return Pending($"{ListChecksCount(CheckState.Pending)} pending check(s)");
         }
 
-        return Succeed($"Successful checks: {ListChecksCount(CheckState.Success)}");
+        return Succeed($"{ListChecksCount(CheckState.Success)} successful check(s)");
     }
 }
 
@@ -78,7 +75,6 @@ public class AllChecksSuccessfulMergePolicyBuilder : IMergePolicyBuilder
     public Task<IReadOnlyList<IMergePolicy>> BuildMergePoliciesAsync(MergePolicyProperties properties, IPullRequest pr)
     {
         var ignoreChecks = new HashSet<string>(properties.Get<string[]>("ignoreChecks") ?? []);
-        IReadOnlyList<IMergePolicy> policies = new List<IMergePolicy> { new AllChecksSuccessfulMergePolicy(ignoreChecks) };
-        return Task.FromResult(policies);
+        return Task.FromResult<IReadOnlyList<IMergePolicy>>([new AllChecksSuccessfulMergePolicy(ignoreChecks)]);
     }
 }

src/Microsoft.DotNet.Darc/Darc/Operations/AddSubscriptionOperation.cs

@@ -245,15 +245,22 @@ public override async Task<int> ExecuteAsync()
 
             // Verify the target
             IRemote targetVerifyRemote = await _remoteFactory.CreateRemoteAsync(targetRepository);
-            if (!await UxHelpers.VerifyAndConfirmBranchExistsAsync(targetVerifyRemote, targetRepository, targetBranch, !_options.Quiet, onlyCheckBranch: sourceEnabled))
+
+            bool onlyCheckBranch = sourceEnabled && !string.IsNullOrEmpty(targetDirectory); 
+            bool targetBranchExists = await UxHelpers.VerifyAndConfirmBranchExistsAsync(targetVerifyRemote, targetRepository, targetBranch, !_options.Quiet, onlyCheckBranch);
+
+            if (!targetBranchExists)
             {
                 Console.WriteLine("Aborting subscription creation.");
                 return Constants.ErrorCode;
             }
 
             // Verify the source.
             IRemote sourceVerifyRemote = await _remoteFactory.CreateRemoteAsync(sourceRepository);
-            if (!await UxHelpers.VerifyAndConfirmRepositoryExistsAsync(sourceVerifyRemote, sourceRepository, !_options.Quiet))
+
+            bool sourceRepositoryExists = await UxHelpers.VerifyAndConfirmRepositoryExistsAsync(sourceVerifyRemote, sourceRepository, !_options.Quiet);
+
+            if (!sourceRepositoryExists)
             {
                 Console.WriteLine("Aborting subscription creation.");
                 return Constants.ErrorCode;

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/BackflowOperation.cs

@@ -19,6 +19,7 @@ internal class BackflowOperation(
     IVmrInfo vmrInfo,
     IVmrDependencyTracker dependencyTracker,
     ILocalGitRepoFactory localGitRepoFactory,
+    IBasicBarClient basicBarClient,
     ILogger<BackflowOperation> logger)
     : CodeFlowOperation(options, vmrInfo, dependencyTracker, localGitRepoFactory, logger)
 {
@@ -30,10 +31,13 @@ protected override async Task<bool> FlowAsync(
         NativePath targetDirectory,
         CancellationToken cancellationToken)
     {
+        var build = await basicBarClient.GetBuildAsync(_options.Build
+            ?? throw new ArgumentException("Please specify a build to flow"));
+
         return await vmrBackFlower.FlowBackAsync(
             mappingName,
             targetDirectory,
-            _options.Build ?? throw new Exception("Please specify a build to flow"),
+            build,
             excludedAssets: null,
             await GetBaseBranch(targetDirectory),
             await GetTargetBranch(_vmrInfo.VmrPath),

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ForwardFlowOperation.cs

@@ -19,24 +19,30 @@ internal class ForwardFlowOperation(
     IVmrInfo vmrInfo,
     IVmrDependencyTracker dependencyTracker,
     ILocalGitRepoFactory localGitRepoFactory,
+    IBasicBarClient basicBarClient,
     ILogger<ForwardFlowOperation> logger)
     : CodeFlowOperation(options, vmrInfo, dependencyTracker, localGitRepoFactory, logger)
 {
     private readonly ForwardFlowCommandLineOptions _options = options;
+    private readonly IVmrInfo _vmrInfo = vmrInfo;
 
     protected override async Task<bool> FlowAsync(
         string mappingName,
         NativePath repoPath,
         CancellationToken cancellationToken)
     {
+        var build = await basicBarClient.GetBuildAsync(_options.Build
+            ?? throw new ArgumentException("Please specify a build to flow"));
+
         return await vmrForwardFlower.FlowForwardAsync(
             mappingName,
             repoPath,
-            _options.Build ?? throw new Exception("Please specify a build to flow"),
+            build,
             excludedAssets: null,
             await GetBaseBranch(new NativePath(_options.VmrPath)),
             await GetTargetBranch(repoPath),
+            _vmrInfo.VmrPath,
             _options.DiscardPatches,
-            cancellationToken);
+            cancellationToken: cancellationToken);
     }
 }

src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/UpdateOperation.cs

@@ -35,17 +35,13 @@ protected override async Task ExecuteInternalAsync(
         await _vmrUpdater.UpdateRepository(
             repoName,
             targetRevision,
-            targetVersion: null,
-            officialBuildId: null,
-            barId: null,
             _options.Recursive,
             additionalRemotes,
             _options.TpnTemplate,
             _options.GenerateCodeowners,
             _options.GenerateCredScanSuppressions,
             _options.DiscardPatches,
-            reapplyVmrPatches: false,
             _options.EnableBuildLookUp,
-            cancellationToken);
+            cancellationToken: cancellationToken);
     }
 }