[Rollout] Production rollout 2025-02-25 (#4490)

#4489

Author: premun

Directory.Packages.props

@@ -97,14 +97,14 @@
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.3" />
     <PackageVersion Include="Microsoft.Extensions.Logging.ApplicationInsights" Version="2.22.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="8.0.2" />
     <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="$(AspireVersion)" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.10.4" />
-    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.4" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.11.4" />
+    <PackageVersion Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.11.4" />
     <PackageVersion Include="Microsoft.Identity.Web" Version="2.18.2" />
     <PackageVersion Include="Microsoft.TeamFoundationServer.Client" Version="19.232.0-preview" />
     <PackageVersion Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />

src/Microsoft.DotNet.Darc/Darc/Helpers/UxHelpers.cs

@@ -79,22 +79,6 @@ public static string GetSubscriptionDescription(Subscription subscription)
         return $"{subscription.SourceRepository} ({subscription.Channel.Name}) ==> '{subscription.TargetRepository}' ('{subscription.TargetBranch}')";
     }
 
-    /// <summary>
-    /// Get a link to the build in AzDO, or null if it cannot be constructed.
-    /// </summary>
-    /// <param name="build">Build</param>
-    /// <returns>Link to the build in AzDO</returns>
-    private static string GetBuildLink(Build build)
-    {
-        if (!string.IsNullOrEmpty(build.AzureDevOpsAccount) &&
-            !string.IsNullOrEmpty(build.AzureDevOpsProject) &&
-            build.AzureDevOpsBuildId.HasValue)
-        {
-            return $"https://dev.azure.com/{build.AzureDevOpsAccount}/{build.AzureDevOpsProject}/_build/results?buildId={build.AzureDevOpsBuildId.Value}";
-        }
-        return null;
-    }
-
     /// <summary>
     /// Get the build description as a JObject.
     /// </summary>
@@ -110,7 +94,7 @@ public static JObject GetJsonBuildDescription(Build build)
             commit = build.Commit,
             buildNumber = build.AzureDevOpsBuildNumber,
             dateProduced = build.DateProduced.ToLocalTime().ToString("g"),
-            buildLink = GetBuildLink(build),
+            buildLink = build.GetBuildLink(),
             azdoBuildId = build.AzureDevOpsBuildId,
             released = build.Released,
             channels = build.Channels.Select(channel => channel.Name)
@@ -130,7 +114,7 @@ public static string GetTextBuildDescription(Build build)
         builder.AppendLine($"Commit:        {build.Commit}");
         builder.AppendLine($"Build Number:  {build.AzureDevOpsBuildNumber}");
         builder.AppendLine($"Date Produced: {build.DateProduced.ToLocalTime().ToString("g")}");
-        builder.AppendLine($"Build Link:    {GetBuildLink(build) ?? "N/A"}");
+        builder.AppendLine($"Build Link:    {build.GetBuildLink() ?? "N/A"}");
         builder.AppendLine($"AzDO Build Id: {build.AzureDevOpsBuildId}");
         builder.AppendLine($"BAR Build Id:  {build.Id}");
         builder.AppendLine($"Released:      {build.Released}");

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

@@ -9,6 +9,7 @@
 using Microsoft.DotNet.DarcLib.Helpers;
 using Microsoft.DotNet.DarcLib.VirtualMonoRepo;
 using Microsoft.Extensions.Logging;
+using Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
 
 #nullable enable
 namespace Microsoft.DotNet.Darc.Operations.VirtualMonoRepo;
@@ -34,7 +35,7 @@ protected override async Task<bool> FlowAsync(
         var build = await basicBarClient.GetBuildAsync(_options.Build
             ?? throw new ArgumentException("Please specify a build to flow"));
 
-        return await vmrForwardFlower.FlowForwardAsync(
+        CodeFlowResult codeFlowRes = await vmrForwardFlower.FlowForwardAsync(
             mappingName,
             repoPath,
             build,
@@ -44,5 +45,6 @@ await GetTargetBranch(repoPath),
             _vmrInfo.VmrPath,
             _options.DiscardPatches,
             cancellationToken: cancellationToken);
+        return codeFlowRes.hadUpdates;
     }
 }

src/Microsoft.DotNet.Darc/DarcLib/LocalLibGit2Client.cs

@@ -11,7 +11,9 @@
 using LibGit2Sharp;
 using Maestro.Common;
 using Microsoft.DotNet.DarcLib.Helpers;
+using Microsoft.DotNet.Services.Utility;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 
 #nullable enable
 namespace Microsoft.DotNet.DarcLib;
@@ -23,6 +25,7 @@ public class LocalLibGit2Client : LocalGitClient, ILocalLibGit2Client
 {
     private readonly IRemoteTokenProvider _remoteTokenProvider;
     private readonly IProcessManager _processManager;
+    private readonly ExponentialRetry _exponentialRetry;
     private readonly ILogger _logger;
 
     public LocalLibGit2Client(
@@ -35,13 +38,17 @@ public LocalLibGit2Client(
     {
         _remoteTokenProvider = remoteTokenProvider;
         _processManager = processManager;
+        _exponentialRetry = new ExponentialRetry(Options.Create(new ExponentialRetryOptions
+        {
+            RetryCount = 3,
+            RetryBackOffFactor = 1.3,
+        }));
         _logger = logger;
     }
 
     public async Task CommitFilesAsync(List<GitFile> filesToCommit, string repoPath, string branch, string commitMessage)
     {
         repoPath = await GetRootDirAsync(repoPath);
-
         try
         {
             using (var localRepo = new Repository(repoPath))
@@ -358,7 +365,14 @@ public async Task Push(
                 }
         };
 
-        repo.Network.Push(remote, branch.CanonicalName, pushOptions);
+        await _exponentialRetry.RetryAsync(
+            () =>
+            {
+                repo.Network.Push(remote, branch.CanonicalName, pushOptions);
+                return Task.CompletedTask;
+            },
+            ex => _logger.LogWarning(ex, "An exception occurred during `git push`: {exceptionMessage}. Retrying...", ex.Message),
+            ex => ex is LibGit2SharpException);
         repo.Branches.Update(branch, b => b.TrackedBranch = $"refs/remotes/{remote.Name}/{branch.FriendlyName}");
 
         _logger.LogInformation("Pushed branch {branch} to {remote}", branch, remote.Url);

src/Microsoft.DotNet.Darc/DarcLib/Models/VirtualMonoRepo/CodeFlowResult.cs

@@ -0,0 +1,12 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using Microsoft.DotNet.DarcLib.Helpers;
+
+namespace Microsoft.DotNet.DarcLib.Models.VirtualMonoRepo;
+
+public record CodeFlowResult(
+        bool hadUpdates, 
+        NativePath repoPath,
+        string previousFlowRepoSha,
+        string previousFlowVmrSha);

src/Microsoft.DotNet.Darc/DarcLib/Models/VirtualMonoRepo/SourceMappingFile.cs

@@ -36,6 +36,11 @@ public class SourceMappingFile
     /// </summary>
     public string? SourceMappingsPath { get; set; }
 
+    /// <summary>
+    /// Location within the VMR where the third-party notices template file is stored
+    /// </summary>
+    public string? ThirdPartyNoticesTemplatePath { get; set; }
+
     /// <summary>
     /// Each of these mappings has a corresponding folder in the src/ directory
     /// </summary>

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/CodeFlowVmrUpdater.cs

@@ -149,7 +149,7 @@ await UpdateRepoToRevisionAsync(
                 currentVersion.Sha,
                 commitMessage,
                 restoreVmrPatches: false,
-                tpnTemplatePath: _vmrInfo.VmrPath / VmrInfo.ThirdPartyNoticesTemplatePath,
+                tpnTemplatePath: _vmrInfo.ThirdPartyNoticesTemplateFullPath,
                 generateCodeowners: true,
                 generateCredScanSuppressions: true,
                 discardPatches: true,

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/PcsVmrBackFlower.cs

@@ -30,7 +30,7 @@ public interface IPcsVmrBackFlower : IVmrBackFlower
     ///     Boolean whether there were any changes to be flown
     ///     and a path to the local repo where the new branch is created
     ///  </returns>
-    Task<(bool HadUpdates, NativePath RepoPath)> FlowBackAsync(
+    Task<CodeFlowResult> FlowBackAsync(
         Subscription subscription,
         Build build,
         string targetBranch,
@@ -69,7 +69,7 @@ public PcsVmrBackFlower(
         _repositoryCloneManager = repositoryCloneManager;
     }
 
-    public async Task<(bool HadUpdates, NativePath RepoPath)> FlowBackAsync(
+    public async Task<CodeFlowResult> FlowBackAsync(
         Subscription subscription,
         Build build,
         string targetBranch,
@@ -95,7 +95,11 @@ public PcsVmrBackFlower(
             headBranchExisted,
             cancellationToken);
 
-        return (hadUpdates, targetRepo.Path);
+        return new CodeFlowResult(
+            hadUpdates, 
+            targetRepo.Path,
+            lastFlow.RepoSha,
+            lastFlow.VmrSha);
     }
 
     private async Task<(bool, SourceMapping, ILocalGitRepo)> PrepareVmrAndRepo(

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/PcsVmrForwardFlower.cs

@@ -25,8 +25,7 @@ public interface IPcsVmrForwardFlower
     /// <param name="subscription">Subscription to flow</param>
     /// <param name="build">Build to flow</param>
     /// <param name="targetBranch">Target branch to make the changes on</param>
-    /// <returns>True when there were changes to be flown</returns>
-    Task<bool> FlowForwardAsync(
+    Task<CodeFlowResult> FlowForwardAsync(
         Subscription subscription,
         Build build,
         string headBranch,
@@ -59,7 +58,7 @@ public PcsVmrForwardFlower(
         _repositoryCloneManager = repositoryCloneManager;
     }
 
-    public async Task<bool> FlowForwardAsync(
+    public async Task<CodeFlowResult> FlowForwardAsync(
         Subscription subscription,
         Build build,
         string headBranch,

src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/SourceMappingParser.cs

@@ -56,6 +56,7 @@ public async Task<IReadOnlyCollection<SourceMapping>> ParseMappings(string mappi
 
         _vmrInfo.PatchesPath = NormalizePath(settings.PatchesPath);
         _vmrInfo.SourceMappingsPath = settings.SourceMappingsPath;
+        _vmrInfo.ThirdPartyNoticesTemplatePath = settings.ThirdPartyNoticesTemplatePath;
 
         if (settings.AdditionalMappings is not null)
         {