[Rollout] Production rollout 2025-09-03 (#5236)

premun · web-flow · commit de9f1f537dc8 · 2025-09-02T16:04:44.000+02:00
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!--
 This file is auto-generated by the Maestro dependency flow system.
 Do not edit it manually, as it will get overwritten by automation.
@@ -21,11 +20,11 @@ This file should be imported by eng/Versions.props
     <MicrosoftDotNetKustoPackageVersion>1.1.0-beta.25215.1</MicrosoftDotNetKustoPackageVersion>
     <MicrosoftDotNetServicesUtilityPackageVersion>1.1.0-beta.25215.1</MicrosoftDotNetServicesUtilityPackageVersion>
     <!-- dotnet/arcade dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.25422.2</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.25422.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
-    <MicrosoftDotNetSignToolPackageVersion>8.0.0-beta.25422.2</MicrosoftDotNetSignToolPackageVersion>
-    <MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>8.0.0-beta.25422.2</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
-    <MicrosoftDotNetVersionToolsPackageVersion>8.0.0-beta.25422.2</MicrosoftDotNetVersionToolsPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>8.0.0-beta.25427.4</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksFeedPackageVersion>8.0.0-beta.25427.4</MicrosoftDotNetBuildTasksFeedPackageVersion>
+    <MicrosoftDotNetSignToolPackageVersion>8.0.0-beta.25427.4</MicrosoftDotNetSignToolPackageVersion>
+    <MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>8.0.0-beta.25427.4</MicrosoftDotNetSwaggerGeneratorMSBuildPackageVersion>
+    <MicrosoftDotNetVersionToolsPackageVersion>8.0.0-beta.25427.4</MicrosoftDotNetVersionToolsPackageVersion>
     <!-- dotnet/dnceng dependencies -->
     <MicrosoftDncEngConfigurationBootstrapPackageVersion>1.1.0-beta.25421.1</MicrosoftDncEngConfigurationBootstrapPackageVersion>
     <MicrosoftDncEngSecretManagerPackageVersion>1.1.0-beta.25421.1</MicrosoftDncEngSecretManagerPackageVersion>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -55,25 +55,25 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25422.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25427.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3e8ada7bce86d4218abd6d9a40daadddabdf16c9</Sha>
+      <Sha>6e78cc9faf0ab29992b01007d71519655344e74c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25422.2">
+    <Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25427.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3e8ada7bce86d4218abd6d9a40daadddabdf16c9</Sha>
+      <Sha>6e78cc9faf0ab29992b01007d71519655344e74c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25422.2">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.25427.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3e8ada7bce86d4218abd6d9a40daadddabdf16c9</Sha>
+      <Sha>6e78cc9faf0ab29992b01007d71519655344e74c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.25422.2">
+    <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="8.0.0-beta.25427.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3e8ada7bce86d4218abd6d9a40daadddabdf16c9</Sha>
+      <Sha>6e78cc9faf0ab29992b01007d71519655344e74c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25422.2">
+    <Dependency Name="Microsoft.DotNet.VersionTools" Version="8.0.0-beta.25427.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>3e8ada7bce86d4218abd6d9a40daadddabdf16c9</Sha>
+      <Sha>6e78cc9faf0ab29992b01007d71519655344e74c</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DncEng.SecretManager" Version="1.1.0-beta.25421.1">
       <Uri>https://github.com/dotnet/dnceng</Uri>
diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml
@@ -31,6 +31,9 @@ parameters:
   #   container and pool.
   platform: {}
 
+  # Optional list of directories to ignore for component governance scans.
+  cgIgnoreDirectories: []
+
   # If set to true and running on a non-public project,
   # Internal blob storage locations will be enabled.
   # This is not enabled by default because many repositories do not need internal sources
@@ -73,3 +76,4 @@ jobs:
   - template: /eng/common/templates-official/steps/source-build.yml
     parameters:
       platform: ${{ parameters.platform }}
+      cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml
@@ -21,6 +21,9 @@ parameters:
   # one job runs on 'defaultManagedPlatform'.
   platforms: []
 
+  # Optional list of directories to ignore for component governance scans.
+  cgIgnoreDirectories: []
+
   # If set to true and running on a non-public project,
   # Internal nuget and blob storage locations will be enabled.
   # This is not enabled by default because many repositories do not need internal sources
@@ -44,11 +47,13 @@ jobs:
     parameters:
       jobNamePrefix: ${{ parameters.jobNamePrefix }}
       platform: ${{ platform }}
+      cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
       enableInternalSources: ${{ parameters.enableInternalSources }}
 
 - ${{ if eq(length(parameters.platforms), 0) }}:
   - template: /eng/common/templates-official/job/source-build.yml
     parameters:
       jobNamePrefix: ${{ parameters.jobNamePrefix }}
       platform: ${{ parameters.defaultManagedPlatform }}
+      cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
       enableInternalSources: ${{ parameters.enableInternalSources }}
diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml
@@ -12,6 +12,9 @@ parameters:
   # the usage of the properties on this object is split between the 'job' and 'steps' templates.
   platform: {}
 
+  # Optional list of directories to ignore for component governance scans.
+  cgIgnoreDirectories: []
+
 steps:
 # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.)
 - script: |
@@ -126,4 +129,7 @@ steps:
 - task: ComponentGovernanceComponentDetection@0
   displayName: Component Detection (Exclude upstream cache)
   inputs:
-    ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
+    ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}:
+      ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
+    ${{ else }}:
+      ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }}
diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml
@@ -31,6 +31,9 @@ parameters:
   #   container and pool.
   platform: {}
 
+  # Optional list of directories to ignore for component governance scans.
+  cgIgnoreDirectories: []
+
   # If set to true and running on a non-public project,
   # Internal blob storage locations will be enabled.
   # This is not enabled by default because many repositories do not need internal sources
@@ -72,3 +75,4 @@ jobs:
   - template: /eng/common/templates/steps/source-build.yml
     parameters:
       platform: ${{ parameters.platform }}
+      cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml
@@ -21,6 +21,9 @@ parameters:
   # one job runs on 'defaultManagedPlatform'.
   platforms: []
 
+  # Optional list of directories to ignore for component governance scans.
+  cgIgnoreDirectories: []
+
   # If set to true and running on a non-public project,
   # Internal nuget and blob storage locations will be enabled.
   # This is not enabled by default because many repositories do not need internal sources
@@ -44,11 +47,13 @@ jobs:
     parameters:
       jobNamePrefix: ${{ parameters.jobNamePrefix }}
       platform: ${{ platform }}
+      cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
       enableInternalSources: ${{ parameters.enableInternalSources }}
 
 - ${{ if eq(length(parameters.platforms), 0) }}:
   - template: /eng/common/templates/job/source-build.yml
     parameters:
       jobNamePrefix: ${{ parameters.jobNamePrefix }}
       platform: ${{ parameters.defaultManagedPlatform }}
+      cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }}
       enableInternalSources: ${{ parameters.enableInternalSources }}
diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml
@@ -12,6 +12,9 @@ parameters:
   # the usage of the properties on this object is split between the 'job' and 'steps' templates.
   platform: {}
 
+  # Optional list of directories to ignore for component governance scans.
+  cgIgnoreDirectories: []
+
 steps:
 # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.)
 - script: |
@@ -126,4 +129,7 @@ steps:
 - task: ComponentGovernanceComponentDetection@0
   displayName: Component Detection (Exclude upstream cache)
   inputs:
-    ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
+    ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}:
+      ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache'
+    ${{ else }}:
+      ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }}
diff --git a/global.json b/global.json
@@ -15,6 +15,6 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25422.2"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25427.4"
   }
 }
diff --git a/src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/BackflowOperation.cs b/src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/BackflowOperation.cs
@@ -52,5 +52,5 @@ await FlowCodeLocallyAsync(
             cancellationToken);
     }
 
-    protected override IEnumerable<string> GetIgnoredFiles(string mapping) => DependencyFileManager.DependencyFiles;
+    protected override IEnumerable<string> GetIgnoredFiles(string mapping) => DependencyFileManager.CodeflowDependencyFiles;
 }
diff --git a/src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ForwardFlowOperation.cs b/src/Microsoft.DotNet.Darc/Darc/Operations/VirtualMonoRepo/ForwardFlowOperation.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.DotNet.Darc.Options.VirtualMonoRepo;
@@ -53,6 +54,7 @@ await FlowCodeLocallyAsync(
     protected override IEnumerable<string> GetIgnoredFiles(string mapping) =>
     [
         VmrInfo.DefaultRelativeSourceManifestPath,
-        VmrInfo.GetRelativeRepoSourcesPath(mapping) / VersionFiles.VersionDetailsXml,
+        .. DependencyFileManager.CodeflowDependencyFiles
+            .Select(f => VmrInfo.GetRelativeRepoSourcesPath(mapping) / f)
     ];
 }
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/AzureDevOpsClient.cs b/src/Microsoft.DotNet.Darc/DarcLib/AzureDevOpsClient.cs
@@ -584,7 +584,7 @@ public async Task<List<GitFile>> GetFilesAtCommitAsync(string repoUri, string co
         {
             if (!item.IsFolder)
             {
-                if (!DependencyFileManager.DependencyFiles.Contains(item.Path))
+                if (!DependencyFileManager.NonCodeflowDependencyFiles.Contains(item.Path))
                 {
                     string fileContent = await GetFileContentsAsync(accountName, projectName, repoName, item.Path, commit);
                     var gitCommit = new GitFile(item.Path.TrimStart('/'), fileContent);
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/Helpers/DependencyFileManager.cs b/src/Microsoft.DotNet.Darc/DarcLib/Helpers/DependencyFileManager.cs
@@ -87,7 +87,7 @@ public DependencyFileManager(
         _logger = logger;
     }
 
-    public static ImmutableHashSet<string> DependencyFiles { get; } = new HashSet<string>()
+    public static ImmutableHashSet<string> NonCodeflowDependencyFiles { get; } = new HashSet<string>()
     {
         VersionFiles.VersionDetailsXml,
         VersionFiles.VersionDetailsProps,
@@ -96,6 +96,9 @@ public DependencyFileManager(
         VersionFiles.DotnetToolsConfigJson
     }.ToImmutableHashSet();
 
+    // In VMR repos, Versions.props doesn't contain any dependency versions maintained by automation, so every change is meaningful
+    public static ImmutableHashSet<string> CodeflowDependencyFiles { get; } = NonCodeflowDependencyFiles.Except([VersionFiles.VersionsProps]).ToImmutableHashSet();
+
     public async Task<XmlDocument> ReadVersionDetailsXmlAsync(string repoUri, string branch, UnixPath relativeBasePath = null)
         => await ReadXmlFileAsync(GetVersionFilePath(VersionFiles.VersionDetailsXml, relativeBasePath), repoUri, branch);
 
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/BackflowConflictResolver.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/BackflowConflictResolver.cs
@@ -197,7 +197,7 @@ private async Task<bool> TryResolvingConflicts(
         {
             // Known version file - check out the branch version, we want to override it
             // See https://github.com/dotnet/arcade-services/issues/4865
-            if (DependencyFileManager.DependencyFiles.Any(f => f.Equals(conflictedFile, StringComparison.OrdinalIgnoreCase)))
+            if (DependencyFileManager.CodeflowDependencyFiles.Any(f => f.Equals(conflictedFile, StringComparison.OrdinalIgnoreCase)))
             {
                 // Revert files so that we can resolve the conflicts
                 // We use the target branch version when we are flowing the first time (because we did not flow the version files yet)
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/CodeflowChangeAnalyzer.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/CodeflowChangeAnalyzer.cs
@@ -106,7 +106,7 @@ public async Task<bool> ForwardFlowHasMeaningfulChangesAsync(string mappingName,
         }
 
         var unknownChangedFiles = changedFiles
-            .Except(DependencyFileManager.DependencyFiles, StringComparer.OrdinalIgnoreCase);
+            .Except(DependencyFileManager.CodeflowDependencyFiles, StringComparer.OrdinalIgnoreCase);
 
         if (unknownChangedFiles.Any())
         {
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrBackflower.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrBackflower.cs
@@ -454,10 +454,8 @@ private IReadOnlyCollection<string> GetPatchExclusions(SourceMapping mapping)
             .Select(s => s.Path.Substring(mapping.Name.Length + 1));
 
         // Exclude version files as those will be handled manually
-        // TODO: once all codeflow repos/branches add VersionDetailsProps, we should remove Version.props from this list
-        // https://github.com/dotnet/arcade-services/issues/4998
         exclusions = exclusions
-            .Concat(DependencyFileManager.DependencyFiles.Where(file => file != VersionFiles.VersionsProps));
+            .Concat(DependencyFileManager.CodeflowDependencyFiles);
 
         // Exclude eng/common for non-arcade mappings (it will be copied separately based on the Arcade.Sdk package version)
         if (mapping.Name != VmrInfo.ArcadeMappingName)
diff --git a/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs b/src/Microsoft.DotNet.Darc/DarcLib/VirtualMonoRepo/VmrForwardFlower.cs
@@ -61,14 +61,6 @@ public class VmrForwardFlower : VmrCodeFlower, IVmrForwardFlower
     private readonly IProcessManager _processManager;
     private readonly ILogger<VmrCodeFlower> _logger;
 
-    private static readonly string[] PatchExclusions =
-    [
-        VersionFiles.VersionDetailsXml,
-        VersionFiles.VersionDetailsProps,
-        VersionFiles.GlobalJson,
-        VersionFiles.DotnetToolsConfigJson
-    ];
-
     public VmrForwardFlower(
             IVmrInfo vmrInfo,
             ISourceManifest sourceManifest,
@@ -238,7 +230,7 @@ protected override async Task<bool> SameDirectionFlowAsync(
             return await _vmrUpdater.UpdateRepository(
                 mapping,
                 build,
-                additionalFileExclusions: PatchExclusions,
+                additionalFileExclusions: [.. DependencyFileManager.CodeflowDependencyFiles],
                 resetToRemoteWhenCloningRepo: ShouldResetClones,
                 cancellationToken: cancellationToken);
         }
@@ -269,7 +261,7 @@ await RecreatePreviousFlowsAndApplyChanges(
                     hadChanges = await _vmrUpdater.UpdateRepository(
                         mapping,
                         build,
-                        additionalFileExclusions: PatchExclusions,
+                        additionalFileExclusions: [.. DependencyFileManager.CodeflowDependencyFiles],
                         resetToRemoteWhenCloningRepo: ShouldResetClones,
                         cancellationToken: cancellationToken);
                 },
@@ -318,7 +310,7 @@ protected override async Task<bool> OppositeDirectionFlowAsync(
         [
             .. mapping.Include.Select(VmrPatchHandler.GetInclusionRule),
             .. mapping.Exclude.Select(VmrPatchHandler.GetExclusionRule),
-            .. PatchExclusions.Select(VmrPatchHandler.GetExclusionRule),
+            .. DependencyFileManager.CodeflowDependencyFiles.Select(VmrPatchHandler.GetExclusionRule),
         ];
 
         var result = await _processManager.Execute(
@@ -345,7 +337,7 @@ .. PatchExclusions.Select(VmrPatchHandler.GetExclusionRule),
         bool hadChanges = await _vmrUpdater.UpdateRepository(
             mapping,
             build,
-            additionalFileExclusions: PatchExclusions,
+            additionalFileExclusions: [.. DependencyFileManager.CodeflowDependencyFiles],
             fromSha: currentSha,
             resetToRemoteWhenCloningRepo: ShouldResetClones,
             cancellationToken: cancellationToken);
diff --git a/src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestBuilder.cs b/src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestBuilder.cs
diff --git a/src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestUpdater.cs b/src/ProductConstructionService/ProductConstructionService.DependencyFlow/PullRequestUpdater.cs
diff --git a/test/Microsoft.DotNet.DarcLib.Tests/VirtualMonoRepo/CodeflowChangeAnalyzerTests.cs b/test/Microsoft.DotNet.DarcLib.Tests/VirtualMonoRepo/CodeflowChangeAnalyzerTests.cs
diff --git a/test/ProductConstructionService.DependencyFlow.Tests/PullRequestBuilderTests.cs b/test/ProductConstructionService.DependencyFlow.Tests/PullRequestBuilderTests.cs

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,6 @@`
`15`	`15`	`}`
`16`	`16`	`},`
`17`	`17`	`"msbuild-sdks": {`
`18`		`- "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25422.2"`
	`18`	`+ "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25427.4"`
`19`	`19`	`}`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,5 +52,5 @@ await FlowCodeLocallyAsync(`
`52`	`52`	`cancellationToken);`
`53`	`53`	`}`
`54`	`54`
`55`		`- protected override IEnumerable<string> GetIgnoredFiles(string mapping) => DependencyFileManager.DependencyFiles;`
	`55`	`+ protected override IEnumerable<string> GetIgnoredFiles(string mapping) => DependencyFileManager.CodeflowDependencyFiles;`
`56`	`56`	`}`