[Rollout] Production rollout 2025-04-29 (#4766)

#4765

Author: premun

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

@@ -580,7 +580,7 @@ private async Task<List<DependencyUpdate>> BackflowDependenciesAndToolset(
         await targetRepo.StageAsync(["."], cancellationToken);
 
         await targetRepo.CommitAsync(
-            "Update dependencies from " + build.GetRepository(),
+            "Update dependencies from " + build.GetRepository() + " build " + build.Id,
             allowEmpty: false,
             cancellationToken: cancellationToken);
 

src/ProductConstructionService/ProductConstructionService.DependencyFlow/PcsVmrBackFlower.cs

@@ -79,7 +79,7 @@ public async Task<CodeFlowResult> FlowBackAsync(
 
         Codeflow lastFlow = await GetLastFlowAsync(mapping, targetRepo, currentIsBackflow: true);
 
-        return await FlowBackAsync(
+        var result = await FlowBackAsync(
             mapping,
             targetRepo,
             lastFlow,
@@ -90,6 +90,14 @@ public async Task<CodeFlowResult> FlowBackAsync(
             discardPatches: true,
             headBranchExisted,
             cancellationToken);
+
+        // TODO: https://github.com/dotnet/arcade-services/issues/4763
+        // We also return true when headBranchExisted so that we always flow even the <Source> tag change in an already existing PR
+        // This is a workaround and will be fixed later properly
+        return result with
+        {
+            HadUpdates = result.HadUpdates || headBranchExisted
+        };
     }
 
     private async Task<(bool, SourceMapping, ILocalGitRepo)> PrepareVmrAndRepo(

src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestBuilder.cs

@@ -242,7 +242,7 @@ public string GenerateCodeFlowPRDescription(
         return CompressRepeatedLinksInDescription(desc);
     }
 
-    private string GenerateCodeFlowPRDescriptionInternal(
+    private static string GenerateCodeFlowPRDescriptionInternal(
         SubscriptionUpdateWorkItem update,
         BuildDTO build,
         string previousSourceCommit,
@@ -282,7 +282,7 @@ This pull request brings the following source code changes
         }
     }
 
-    private String GenerateCodeFlowDescriptionForSubscription(
+    private static string GenerateCodeFlowDescriptionForSubscription(
         Guid subscriptionId,
         string previousSourceCommit,
         BuildDTO build,
@@ -301,7 +301,7 @@ private String GenerateCodeFlowDescriptionForSubscription(
             - **Subscription**: {GetSubscriptionLink(subscriptionId)}
             - **Build**: [{build.AzureDevOpsBuildNumber}]({build.GetBuildLink()})
             - **Date Produced**: {build.DateProduced.ToUniversalTime():MMMM d, yyyy h:mm:ss tt UTC}
-            - **Source Diff**: {sourceDiffText}
+            - **Commit Diff**: {sourceDiffText}
             - **Commit**: [{build.Commit}]({build.GetCommitLink()})
             - **Branch**: {build.GetBranch()}
             {dependencyUpdateBlock}
@@ -419,11 +419,11 @@ private static string CreateSourceDiffLink(BuildDTO build, string previousSource
             return CommitDiffNotAvailableMsg;
         }
 
-        string sourceDiffText = $"{Commit.GetShortSha(previousSourceCommit)}..{Commit.GetShortSha(build.Commit)}";
+        string sourceDiffText = $"{Commit.GetShortSha(previousSourceCommit)}...{Commit.GetShortSha(build.Commit)}";
 
         if (!string.IsNullOrEmpty(build.GitHubRepository))
         {
-            return $"[{sourceDiffText}]({build.GitHubRepository}/compare/{previousSourceCommit}..{build.Commit})";
+            return $"[{sourceDiffText}]({build.GitHubRepository}/compare/{previousSourceCommit}...{build.Commit})";
         }
         else if (!string.IsNullOrEmpty(build.AzureDevOpsRepository))
         {

test/ProductConstructionService.DependencyFlow.Tests/PullRequestBuilderTests.cs

@@ -155,7 +155,7 @@ This pull request brings the following source code changes
             - **Subscription**: [{subscriptionGuid}](https://maestro.dot.net/subscriptions?search={subscriptionGuid})
             - **Build**: [{build.AzureDevOpsBuildNumber}](https://dev.azure.com/{build.AzureDevOpsAccount}/{build.AzureDevOpsProject}/_build/results?buildId={build.AzureDevOpsBuildId})
             - **Date Produced**: {build.DateProduced.ToUniversalTime():MMMM d, yyyy h:mm:ss tt UTC}
-            - **Source Diff**: [{shortPreviousCommitSha}..{shortCommitSha}]({build.GitHubRepository}/compare/{mockPreviousCommitSha}..{commitSha})
+            - **Commit Diff**: [{shortPreviousCommitSha}...{shortCommitSha}]({build.GitHubRepository}/compare/{mockPreviousCommitSha}...{commitSha})
             - **Commit**: [{commitSha}]({build.GitHubRepository}/commit/{commitSha})
             - **Branch**: main
             
@@ -235,7 +235,7 @@ This pull request brings the following source code changes
             - **Subscription**: [{subscriptionGuid}](https://maestro.dot.net/subscriptions?search={subscriptionGuid})
             - **Build**: [{build1.AzureDevOpsBuildNumber}](https://dev.azure.com/{build1.AzureDevOpsAccount}/{build1.AzureDevOpsProject}/_build/results?buildId={build1.AzureDevOpsBuildId})
             - **Date Produced**: {build1.DateProduced.ToUniversalTime():MMMM d, yyyy h:mm:ss tt UTC}
-            - **Source Diff**: [{shortPreviousCommitSha}..{shortCommitSha}]({build1.GitHubRepository}/compare/{previousCommitSha}..{commitSha})
+            - **Commit Diff**: [{shortPreviousCommitSha}...{shortCommitSha}]({build1.GitHubRepository}/compare/{previousCommitSha}...{commitSha})
             - **Commit**: [{commitSha}]({build1.GitHubRepository}/commit/{commitSha})
             - **Branch**: main
             
@@ -247,7 +247,7 @@ This pull request brings the following source code changes
             - **Subscription**: [{subscriptionGuid2}](https://maestro.dot.net/subscriptions?search={subscriptionGuid2})
             - **Build**: [{build2.AzureDevOpsBuildNumber}](https://dev.azure.com/{build2.AzureDevOpsAccount}/{build2.AzureDevOpsProject}/_build/results?buildId={build2.AzureDevOpsBuildId})
             - **Date Produced**: {build2.DateProduced.ToUniversalTime():MMMM d, yyyy h:mm:ss tt UTC}
-            - **Source Diff**: [{shortPreviousCommitSha2}..{shortCommitSha2}]({build2.GitHubRepository}/compare/{previousCommitSha2}..{commitSha2})
+            - **Commit Diff**: [{shortPreviousCommitSha2}...{shortCommitSha2}]({build2.GitHubRepository}/compare/{previousCommitSha2}...{commitSha2})
             - **Commit**: [{commitSha2}]({build2.GitHubRepository}/commit/{commitSha2})
             - **Branch**: main