[Rollout] Production rollout 2025-08-22 (#5187)

#5186

Author: premun

eng/Create-CodeflowGraphVizGraph.ps1

@@ -920,7 +920,7 @@ function Get-GitCommits {
     # Get the commit history in format: <sha> <parent-sha>
     # This gives us both the commit SHA and its parent commit SHA
     # We use the %P format to get all parent SHAs (important for merge commits)
-    $commits = git -C $repoPath log -n $count --format="%H %P" main
+    $commits = git -C $repoPath log -n $count --format="%H %P"
 
     # Convert the raw git log output into structured objects
     $commitObjects = @()

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

@@ -73,7 +73,7 @@ protected async Task FlowCodeLocallyAsync(
             ? new ForwardFlow(_options.Ref, await targetRepo.GetShaForRefAsync())
             : new Backflow(_options.Ref, await targetRepo.GetShaForRefAsync());
 
-        await _dependencyTracker.RefreshMetadata();
+        await _dependencyTracker.RefreshMetadataAsync();
 
         SourceMapping mapping = _dependencyTracker.GetMapping(mappingName);
 

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

@@ -26,7 +26,7 @@ public GenerateTpnOperation(
 
     public override async Task<int> ExecuteAsync()
     {
-        await _dependencyTracker.RefreshMetadata();
+        await _dependencyTracker.RefreshMetadataAsync();
         await _generator.UpdateThirdPartyNotices(_options.TpnTemplate);
         return 0;
     }

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

@@ -31,7 +31,7 @@ public GetRepoVersionOperation(
     public override async Task<int> ExecuteAsync()
     {
         var repositories = _options.Repositories.ToList();
-        await _dependencyTracker.RefreshMetadata();
+        await _dependencyTracker.RefreshMetadataAsync();
 
         // If there are no repositories, list all.
         if (!repositories.Any())

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

@@ -67,7 +67,7 @@ public override async Task<int> ExecuteAsync()
         _vmrInfo.VmrPath = new NativePath(_options.VmrPath);
 
         // Validate that the mapping exists
-        await _dependencyTracker.RefreshMetadata();
+        await _dependencyTracker.RefreshMetadataAsync();
 
         SourceMapping mapping;
         try
@@ -121,7 +121,7 @@ .. mapping.Exclude.Select(VmrPatchHandler.GetExclusionRule)
             var targetDir = _vmrInfo.GetRepoSourcesPath(mapping);
             var result = await _processManager.Execute(
                 _processManager.GitExecutable,
-                ["rm", "-r", "-q", "--", .. removalFilters],
+                ["rm", "-r", "-q", "-f", "--", .. removalFilters],
                 workingDir: targetDir);
 
             result.ThrowIfFailed($"Failed to remove files in {targetDir}");

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

@@ -434,7 +434,6 @@ public async Task<GitFileContentContainer> UpdateDependencyFiles(
         string branch,
         IEnumerable<DependencyDetail> oldDependencies,
         SemanticVersion incomingDotNetSdkVersion,
-        bool forceGlobalJsonUpdate = false,
         bool? repoHasVersionDetailsProps = null)
     {
         // When updating version files, we always want to look in the base folder, even when we're updating it in the VMR
@@ -509,7 +508,7 @@ public async Task<GitFileContentContainer> UpdateDependencyFiles(
         Dictionary<GitFileMetadataName, string> globalJsonMetadata = null;
         if (incomingDotNetSdkVersion != null)
         {
-            globalJsonMetadata = UpdateDotnetVersionGlobalJson(incomingDotNetSdkVersion, globalJson, forceGlobalJsonUpdate);
+            globalJsonMetadata = UpdateDotnetVersionGlobalJson(incomingDotNetSdkVersion, globalJson);
         }
 
         var fileContainer = new GitFileContentContainer
@@ -559,60 +558,53 @@ public void UpdateVersionDetailsXmlSourceTag(XmlDocument versionDetails, SourceD
     }
 
     /// <summary>
-    /// Updates the global.json entries for tools.dotnet and sdk.version if they are older than an incoming version
+    /// Updates the global.json entries for tools.dotnet and sdk.version in the repo if incoming version is newer
     /// </summary>
-    /// <param name="incomingDotnetVersion">version to compare against</param>
-    /// <param name="globalJson">Global.Json file to update</param>
-    /// <param name="forceUpdate">Ignores version check and forces globalJson update</param>
+    /// <param name="incomingDotnetVersion">incoming version to compare against</param>
+    /// <param name="targetGlobalJson">Global.Json file to update in target repo</param>
     /// <returns>Updated global.json file if was able to update, or the unchanged global.json if unable to</returns>
     private Dictionary<GitFileMetadataName, string> UpdateDotnetVersionGlobalJson(
         SemanticVersion incomingDotnetVersion,
-        JObject globalJson,
-        bool forceUpdate = false)
+        JObject targetGlobalJson)
     {
-        try
+        JToken pinnedToken = targetGlobalJson.SelectToken("tools.pinned");
+        if (pinnedToken != null && pinnedToken.Type == JTokenType.Boolean && pinnedToken.Value<bool>())
         {
-            // Check if tools.pinned is set to true, if so skip update
-            JToken pinnedToken = globalJson.SelectToken("tools.pinned");
-            if (pinnedToken != null && pinnedToken.Type == JTokenType.Boolean && pinnedToken.Value<bool>())
-            {
-                _logger.LogInformation("Skipping dotnet SDK update because tools.pinned is set to true in global.json");
-                return null;
-            }
+            _logger.LogInformation("Skipping dotnet SDK update because tools.pinned is set to true in the target." +
+                $"repo's {VersionFiles.GlobalJson}");
+            return null;
+        }
 
-            if (SemanticVersion.TryParse(globalJson.SelectToken("tools.dotnet")?.ToString(), out SemanticVersion repoDotnetVersion))
-            {
-                if (repoDotnetVersion.CompareTo(incomingDotnetVersion) < 0 || forceUpdate)
-                {
-                    Dictionary<GitFileMetadataName, string> metadata = [];
+        string dotnetVersion = targetGlobalJson.SelectToken("tools.dotnet")?.ToString();
+        if (dotnetVersion == null)
+        {
+            _logger.LogInformation($"Could not find token `tools.dotnet` in target repo's `{VersionFiles.GlobalJson}`." +
+                "Skipping dotnet SDK update.");
+            return null;
+        }
 
-                    globalJson["tools"]["dotnet"] = incomingDotnetVersion.ToNormalizedString();
-                    metadata.Add(GitFileMetadataName.ToolsDotNetUpdate, incomingDotnetVersion.ToNormalizedString());
+        var targetRepoVersion = SemanticVersion.Parse(dotnetVersion);
+        if (targetRepoVersion.CompareTo(incomingDotnetVersion) > 0)
+        {
+            _logger.LogInformation($"The dotnet SDK version in the target repo's `{VersionFiles.GlobalJson}` is higher than the " +
+                "incoming change. Skipping dotnet SDK update.");
+            return null;
+        }
 
-                    // Also update and keep sdk.version in sync.
-                    JToken sdkVersion = globalJson.SelectToken("sdk.version");
-                    if (sdkVersion != null)
-                    {
-                        globalJson["sdk"]["version"] = incomingDotnetVersion.ToNormalizedString();
-                        metadata.Add(GitFileMetadataName.SdkVersionUpdate, incomingDotnetVersion.ToNormalizedString());
-                    }
+        Dictionary<GitFileMetadataName, string> metadata = [];
 
-                    return metadata;
-                }
-            }
-            else
-            {
-                _logger.LogError("Could not parse the repo's dotnet version from the global.json. Skipping update to dotnet version sections");
-                return null;
-            }
-        }
-        catch (Exception ex)
+        targetGlobalJson["tools"]["dotnet"] = incomingDotnetVersion.ToNormalizedString();
+        metadata.Add(GitFileMetadataName.ToolsDotNetUpdate, incomingDotnetVersion.ToNormalizedString());
+
+        // Also keep sdk.version in sync with tools.dotnet
+        JToken sdkVersion = targetGlobalJson.SelectToken("sdk.version");
+        if (sdkVersion != null)
         {
-            _logger.LogError(ex, "Failed to update Dotnet version for global.json. Skipping update to version sections.");
+            targetGlobalJson["sdk"]["version"] = incomingDotnetVersion.ToNormalizedString();
+            metadata.Add(GitFileMetadataName.SdkVersionUpdate, incomingDotnetVersion.ToNormalizedString());
         }
 
-        // No updates
-        return null;
+        return metadata;
     }
 
     private static bool IsOnlyPresentInMaestroManagedFeed(HashSet<string> locations)

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

@@ -64,7 +64,6 @@ Task<GitFileContentContainer> UpdateDependencyFiles(
         string? branch,
         IEnumerable<DependencyDetail> oldDependencies,
         SemanticVersion? incomingDotNetSdkVersion,
-        bool forceGlobalJsonUpdate = false,
         bool? repoHasVersionDetailsProps = null);
 
     XmlDocument UpdatePackageSources(XmlDocument nugetConfig, Dictionary<string, HashSet<string>> maestroManagedFeedsByRepo);

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

@@ -341,9 +341,7 @@ await _vmrVersionFileMerger.MergeJsonAsync(
             targetRepo.Path,
             branch: null, // reads the working tree
             currentRepoDependencies.Dependencies,
-            targetDotNetVersion,
-            // make sure that we always backflow the VMRs root global.json sdk version
-            forceGlobalJsonUpdate: true);
+            targetDotNetVersion);
 
         // This actually does not commit but stages only
         await _libGit2Client.CommitFilesAsync(updatedFiles.GetFilesToCommit(), targetRepo.Path, null, null);

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

@@ -94,7 +94,7 @@ public async Task<bool> UpdateRepository(
         bool resetToRemoteWhenCloningRepo = false,
         CancellationToken cancellationToken = default)
     {
-        await _dependencyTracker.RefreshMetadata();
+        await _dependencyTracker.RefreshMetadataAsync();
 
         VmrDependencyVersion currentVersion = _dependencyTracker.GetDependencyVersion(mapping)
             ?? throw new Exception($"Failed to find current version for {mapping.Name}");

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

@@ -110,8 +110,7 @@ public async Task<bool> ForwardFlowHasMeaningfulChangesAsync(string mappingName,
 
         if (unknownChangedFiles.Any())
         {
-            _logger.LogInformation("Flow contains changes that warrant PR creation: {files}",
-                string.Join(", ", unknownChangedFiles));
+            _logger.LogInformation("Flow contains changes that warrant PR creation");
             return true;
         }