Unified build assets filter

dotnet · Feb 13, 2025 · 0780505 · 0780505
1 parent bad4633
commit 0780505
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 14 deletions.
diff --git a/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/JoinVerticals.cs b/src/SourceBuild/content/eng/tools/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/JoinVerticals.cs
@@ -70,12 +70,6 @@ public class JoinVerticals : Microsoft.Build.Utilities.Task
     private const string _packagesFolderName = "packages";
     private const int _retryCount = 10;
 
-    private readonly HashSet<string> _excludeAssets = new HashSet<string>(
-        [
-            "Microsoft.Diagnostics.NETCore.Client",
-            "Microsoft.NET.Sdk.Aspire.Manifest-8.0.100"
-        ], StringComparer.OrdinalIgnoreCase);
-
     public override bool Execute()
     {
         ExecuteAsync().GetAwaiter().GetResult();
@@ -92,7 +86,8 @@ private async Task ExecuteAsync()
         string mainVerticalName = mainVerticalManifest.VerticalName!;
 
         JoinVerticalsAssetSelector joinVerticalsAssetSelector = new JoinVerticalsAssetSelector();
-        List<AssetVerticalMatchResult> selectedVerticals = joinVerticalsAssetSelector.SelectAssetMatchingVertical(manifests, _excludeAssets).ToList();
+
+        List<AssetVerticalMatchResult> selectedVerticals = joinVerticalsAssetSelector.SelectAssetMatchingVertical(manifests).ToList();
 
         var notMatchedAssets = selectedVerticals.Where(o => o.MatchType == AssetVerticalMatchType.NotSpecified).ToList();
         Log.LogMessage(MessageImportance.High, $"### {notMatchedAssets.Count()} Assets not properly matched to vertical: ###");

diff --git a/...ls/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/ManifestAssets/JoinVerticalsAssetSelector.cs b/...ls/tasks/Microsoft.DotNet.UnifiedBuild.Tasks/ManifestAssets/JoinVerticalsAssetSelector.cs
@@ -37,7 +37,20 @@ public JoinVerticalsAssetSelector(JoinVerticalsConfig? config = null)
             _config = config ?? JoinVerticalsConfig.GetDefaultConfig();
         }
 
-        public IEnumerable<AssetVerticalMatchResult> SelectAssetMatchingVertical(IEnumerable<BuildAssetsManifest> verticalManifests, HashSet<string>? excludeAssetsByName = null)
+        // Temporary solution to exclude some assets from Unified Build
+        private bool ExcludeAsset(AssetVerticalMatchResult assetVerticalMatch)
+        {
+            return
+                // Skip packages with stable version
+                StringComparer.OrdinalIgnoreCase.Equals(assetVerticalMatch.AssetId, "Microsoft.Diagnostics.NETCore.Client") ||
+                StringComparer.OrdinalIgnoreCase.Equals(assetVerticalMatch.AssetId, "Microsoft.NET.Sdk.Aspire.Manifest-8.0.100") ||
+                // Skip all Nuget packaged as they are missing UB version suffix +100 patch version
+                StringComparer.OrdinalIgnoreCase.Equals(assetVerticalMatch.Asset.RepoOrigin, "nuget-client") ||
+                // Skip productVersion.txt files from all repos except sdk
+                (assetVerticalMatch.AssetId.Contains("/productVersion.txt", StringComparison.OrdinalIgnoreCase) && (assetVerticalMatch.Asset.RepoOrigin != "sdk"));
+        }
+
+        public IEnumerable<AssetVerticalMatchResult> SelectAssetMatchingVertical(IEnumerable<BuildAssetsManifest> verticalManifests)
         {
             bool IsExternalAsset(ManifestAsset asset)
             {
@@ -58,24 +71,25 @@ bool IsExternalAsset(ManifestAsset asset)
             {
                 string assetId = assetGroup.Key;
 
-                if (excludeAssetsByName != null && excludeAssetsByName.Contains(assetId))
-                {
-                    continue;
-                }
-
                 int verticalsCount = assetGroup.Count();
                 var verticalNames = assetGroup.Select(o => o.manifest.VerticalName!).ToList();
                 if (verticalsCount > 0)
                 {
                     (AssetVerticalMatchType matchType, string verticalName) = SelectVerticalForAsset(verticalNames);
-                    yield return new AssetVerticalMatchResult
+
+                    AssetVerticalMatchResult assetVerticalMatch = new AssetVerticalMatchResult
                     {
                         AssetId = assetGroup.Key,
                         MatchType = matchType,
                         VerticalName = verticalName,
                         Asset = assetGroup.FirstOrDefault(o => VerticalNameMatches(o.manifest.VerticalName, verticalName)).asset,
                         OtherVerticals = assetGroup.Select(o => o.manifest.VerticalName!).Where(o => !VerticalNameMatches(o, verticalName)).ToList()
                     };
+
+                    if (!ExcludeAsset(assetVerticalMatch))
+                    {
+                        yield return assetVerticalMatch;
+                    }
                 }
             }
         }