[Rollout] Production rollout 2025-03-25 (#4593)

<!-- Link the GitHub or AzDO issue this pull request is associated with.
Please copy and paste the full URL rather than using the
dotnet/arcade-services# syntax -->

Rollout issue:
#4592

Author: oleksandr-didyk

.config/dotnet-tools.json

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

eng/Version.Details.xml

@@ -83,13 +83,13 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>802042c6e779b73b4edb012ee1d5bae02ec8d41c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25161.2">
+    <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25169.1">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>a584d02e4dee6715fc76104ace6192411bc3c4ed</Sha>
+      <Sha>5dd38e0f431bcb1a7a829246e0ab6b863eddd966</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25161.2">
+    <Dependency Name="Microsoft.DncEng.Configuration.Bootstrap" Version="1.1.0-beta.25169.1">
       <Uri>https://github.com/dotnet/dnceng</Uri>
-      <Sha>a584d02e4dee6715fc76104ace6192411bc3c4ed</Sha>
+      <Sha>5dd38e0f431bcb1a7a829246e0ab6b863eddd966</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

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

src/Microsoft.DotNet.Darc/DarcLib/Helpers/DependencyFileManager.cs

@@ -150,7 +150,7 @@ public async Task<SemanticVersion> ReadToolsDotnetVersionAsync(string repoUri, s
 
         if (!SemanticVersion.TryParse(dotnet.ToString(), out SemanticVersion dotnetVersion))
         {
-            _logger.LogError($"Failed to parse dotnet version from global.json from repo: {repoUri} at commit {commit}. Version: {dotnet}");
+            _logger.LogError("Failed to parse dotnet version from global.json from repo: {repoUri} at commit {commit}. Version: {version}", repoUri, commit, dotnet);
         }
 
         return dotnetVersion;
@@ -163,7 +163,7 @@ public async Task<XmlDocument> ReadNugetConfigAsync(string repoUri, string branc
 
     public async Task<VersionDetails> ParseVersionDetailsXmlAsync(string repoUri, string branch, bool includePinned = true)
     {
-        _logger.LogInformation(
+        _logger.LogDebug(
             $"Getting a collection of dependencies from '{VersionFiles.VersionDetailsXml}' in repo '{repoUri}'" +
             (!string.IsNullOrEmpty(branch) ? $" and branch '{branch}'" : string.Empty) + "...");
 
@@ -1028,21 +1028,31 @@ public static XmlDocument GetXmlDocument(string fileContent)
 
     private async Task<XmlDocument> ReadXmlFileAsync(string filePath, string repoUri, string branch)
     {
-        _logger.LogInformation($"Reading '{filePath}' in repo '{repoUri}' and branch '{branch}'...");
+        _logger.LogDebug("Reading '{file}' in repo '{repoUri}' and branch '{branch}'...",
+            filePath,
+            repoUri,
+            branch);
 
         var fileContent = await GetGitClient(repoUri).GetFileContentsAsync(filePath, repoUri, branch);
 
         try
         {
             XmlDocument document = GetXmlDocument(fileContent);
 
-            _logger.LogInformation($"Reading '{filePath}' from repo '{repoUri}' and branch '{branch}' succeeded!");
+            _logger.LogDebug("Reading '{filePath}' from repo '{repoUri}' and branch '{branch}' succeeded!",
+                filePath,
+                repoUri,
+                branch);
 
             return document;
         }
-        catch (Exception exc)
+        catch
         {
-            _logger.LogError(exc, $"There was an exception while loading '{filePath}'");
+            _logger.LogError(
+                "Failed to read '{filePath}' from repo '{repoUri}' and branch '{branch}'",
+                filePath,
+                repoUri,
+                branch);
             throw;
         }
     }

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

@@ -54,6 +54,12 @@ Task<string> BlameLineAsync(
     /// <param name="repoPath">Path to the repository</param>
     Task<bool> HasWorkingTreeChangesAsync(string repoPath);
 
+    /// <summary>
+    ///    Checks if the repository has any staged changes.
+    /// </summary>
+    /// <param name="repoPath">Path to the repository</param>
+    Task<bool> HasStagedChangesAsync(string repoPath);
+
     /// <summary>
     ///     Checkout the repo to the specified state.
     /// </summary>
@@ -97,6 +103,13 @@ Task CommitAsync(
     /// <param name="overwriteExistingBranch">Whether to overwrite an already existing branch</param>
     Task CreateBranchAsync(string repoPath, string branchName, bool overwriteExistingBranch = false);
 
+    /// <summary>
+    ///     Deletes a local branch.
+    /// </summary>
+    /// <param name="repoPath">Path to a git repository</param>
+    /// <param name="branchName">Name of the branch to delete</param>
+    Task DeleteBranchAsync(string repoPath, string branchName);
+
     /// <summary>
     ///     Fetches from a given remote.
     /// </summary>

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

@@ -64,6 +64,11 @@ Task<string> BlameLineAsync(
     /// </summary>
     Task<bool> HasWorkingTreeChangesAsync();
 
+    /// <summary>
+    ///     Checks if the repository has any staged changes.
+    /// </summary>
+    Task<bool> HasStagedChangesAsync();
+
     /// <summary>
     ///     Checkout the repo to the specified state.
     /// </summary>
@@ -102,6 +107,12 @@ Task CommitAsync(
     /// <param name="overwriteExistingBranch">Whether to overwrite an already existing branch</param>
     Task CreateBranchAsync(string branchName, bool overwriteExistingBranch = false);
 
+    /// <summary>
+    ///     Deletes a local branch.
+    /// </summary>
+    /// <param name="branchName">Name of the branch to delete</param>
+    Task DeleteBranchAsync(string branchName);
+
     /// <summary>
     ///     Fetches from a given remote.
     /// </summary>

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

@@ -125,6 +125,12 @@ public async Task CreateBranchAsync(string repoPath, string branchName, bool ove
         result.ThrowIfFailed($"Failed to create {branchName} in {repoPath}");
     }
 
+    public async Task DeleteBranchAsync(string repoPath, string branchName)
+    {
+        var result = await _processManager.ExecuteGit(repoPath, ["branch", "-D", branchName]);
+        result.ThrowIfFailed($"Failed to delete branch {branchName} in {repoPath}");
+    }
+
     public async Task CommitAsync(
         string repoPath,
         string message,
@@ -494,6 +500,12 @@ public async Task<bool> HasWorkingTreeChangesAsync(string repoPath)
         return !result.Succeeded;
     }
 
+    public async Task<bool> HasStagedChangesAsync(string repoPath)
+    {
+        var result = await _processManager.ExecuteGit(repoPath, ["diff", "--cached", "--exit-code", "--quiet"]);
+        return !result.Succeeded;
+    }
+
     public async Task AddGitAuthHeader(IList<string> args, IDictionary<string, string> envVars, string repoUri)
     {
         var token = await _remoteConfiguration.GetTokenForRepositoryAsync(repoUri);

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

@@ -42,6 +42,9 @@ public async Task<string> BlameLineAsync(string filePath, Func<string, bool> isT
     public async Task<bool> HasWorkingTreeChangesAsync()
         => await _localGitClient.HasWorkingTreeChangesAsync(Path);
 
+    public async Task<bool> HasStagedChangesAsync()
+        => await _localGitClient.HasStagedChangesAsync(Path);
+
     public async Task CheckoutAsync(string refToCheckout)
         => await _localGitClient.CheckoutAsync(Path, refToCheckout);
 
@@ -54,6 +57,9 @@ public async Task CommitAmendAsync(CancellationToken cancellationToken = default
     public async Task CreateBranchAsync(string branchName, bool overwriteExistingBranch = false)
         => await _localGitClient.CreateBranchAsync(Path, branchName, overwriteExistingBranch);
 
+    public async Task DeleteBranchAsync(string branchName)
+        => await _localGitClient.DeleteBranchAsync(Path, branchName);
+
     public async Task<string?> GetFileFromGitAsync(string relativeFilePath, string revision = "HEAD", string? outputPath = null)
         => await _localGitClient.GetFileFromGitAsync(Path, relativeFilePath, revision, outputPath);
 

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

@@ -41,7 +41,7 @@ Task<CodeFlowResult> FlowBackAsync(
         CancellationToken cancellationToken = default);
 }
 
-internal class VmrBackFlower : VmrCodeFlower, IVmrBackFlower
+public class VmrBackFlower : VmrCodeFlower, IVmrBackFlower
 {
     private readonly IVmrInfo _vmrInfo;
     private readonly ISourceManifest _sourceManifest;

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

@@ -18,7 +18,7 @@ namespace Microsoft.DotNet.DarcLib.VirtualMonoRepo;
 /// This class is responsible for taking changes done to a repo in the VMR and backflowing them into the repo.
 /// It only makes patches/changes locally, no other effects are done.
 /// </summary>
-internal abstract class VmrCodeFlower
+public abstract class VmrCodeFlower
 {
     private readonly IVmrInfo _vmrInfo;
     private readonly ISourceManifest _sourceManifest;