[StaticWebAssets] Avoid reading the manifest as part of the Build (#43722)

Author: javiercn

src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Publish.targets

@@ -61,9 +61,16 @@ Copyright (c) .NET Foundation. All rights reserved.
          for example, assets from packages as a result of a publish (no-build) invocation. Those assets were already taken
          into account when we built the build manifest that we are about to load for resuming the publish process. -->
     <PropertyGroup>
-        <_ShouldLoadBuildManifestAndUpdateAssets>false</_ShouldLoadBuildManifestAndUpdateAssets>
-        <_ShouldLoadBuildManifestAndUpdateAssets
-          Condition="@(_CachedBuildStaticWebAssets) == '' or @(_CachedBuildStaticWebAssetDiscoveryPatterns) == '' or @(_CachedBuildStaticWebAssetReferencedProjectsConfiguration) == ''">true</_ShouldLoadBuildManifestAndUpdateAssets>
+      <_HasStaticWebAssetsProjectReferences Condition="@(ProjectReference) != ''">true</_HasStaticWebAssetsProjectReferences>
+      <_HasCachedBuildStaticWebAssets Condition="@(_CachedBuildStaticWebAssets) == ''">false</_HasCachedBuildStaticWebAssets>
+      <_HasCachedBuildStaticWebAssetEndpoints Condition="@(_CachedBuildStaticWebAssetEndpoints) == ''">false</_HasCachedBuildStaticWebAssetEndpoints>
+      <_HasCachedBuildStaticWebAssetDiscoveryPatterns Condition="@(_CachedBuildStaticWebAssetDiscoveryPatterns) == ''">false</_HasCachedBuildStaticWebAssetDiscoveryPatterns>
+      <_HasCachedBuildStaticWebAssetReferencedProjectsConfiguration Condition="@(_CachedBuildStaticWebAssetReferencedProjectsConfiguration) == ''">false</_HasCachedBuildStaticWebAssetReferencedProjectsConfiguration>
+      <_ShouldLoadBuildManifestAndUpdateAssets>false</_ShouldLoadBuildManifestAndUpdateAssets>
+      <_ShouldLoadBuildManifestAndUpdateAssets Condition="'$(_HasCachedBuildStaticWebAssets)' == 'false' or
+        '$(_HasCachedBuildStaticWebAssetEndpoints)' == 'false' or
+        '$(_HasCachedBuildStaticWebAssetDiscoveryPatterns)' == 'false' or
+        ('$(_HasStaticWebAssetsProjectReferences)' == 'true' and '$(_HasCachedBuildStaticWebAssetReferencedProjectsConfiguration)' == 'false')">true</_ShouldLoadBuildManifestAndUpdateAssets>
     </PropertyGroup>
 
     <ItemGroup>
@@ -131,11 +138,11 @@ Copyright (c) .NET Foundation. All rights reserved.
     <ItemGroup>
       <_ReferencedProjectPublishStaticWebAssetsUpdateCandidates
         Include="@(_ReferencedProjectPublishStaticWebAssetsItems)"
-        Condition="'%(_ReferencedProjectPublishStaticWebAssetsItems.ResultType)' == 'StaticWebAsset'" />        
+        Condition="'%(_ReferencedProjectPublishStaticWebAssetsItems.ResultType)' == 'StaticWebAsset'" />
 
       <_ReferencedProjectPublishStaticWebAssetEndpointsUpdateCandidates
         Include="@(_ReferencedProjectPublishStaticWebAssetsItems)"
-        Condition="'%(_ReferencedProjectPublishStaticWebAssetsItems.ResultType)' == 'StaticWebAssetEndpoint'" />        
+        Condition="'%(_ReferencedProjectPublishStaticWebAssetsItems.ResultType)' == 'StaticWebAssetEndpoint'" />
     </ItemGroup>
 
     <UpdateExternallyDefinedStaticWebAssets Condition="$(_HasProjectsWithStaticWebAssetPublishTargets)"

src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets

@@ -640,6 +640,13 @@ Copyright (c) .NET Foundation. All rights reserved.
       CacheFilePath="$(StaticWebAssetBuildManifestPath)">
     </GenerateStaticWebAssetsDevelopmentManifest>
 
+    <ItemGroup>
+      <_CachedBuildStaticWebAssets Condition="'@(_CachedBuildStaticWebAssets)' == ''" Include="@(StaticWebAsset)" />
+      <_CachedBuildStaticWebAssetEndpoints Condition="'@(_CachedBuildStaticWebAssetEndpoints)' == ''" Include="@(StaticWebAssetEndpoint)" />
+      <_CachedBuildStaticWebAssetReferencedProjectsConfiguration Condition="'@(_CachedBuildStaticWebAssetReferencedProjectsConfiguration)' == ''" Include="@(StaticWebAssetProjectConfiguration)" />
+      <_CachedBuildStaticWebAssetDiscoveryPatterns Condition="'@(_CachedBuildStaticWebAssetDiscoveryPatterns)' == ''" Include="@(StaticWebAssetDiscoveryPattern)" />
+    </ItemGroup>
+
     <ItemGroup>
       <FileWrites Include="$(StaticWebAssetBuildManifestPath)" />
       <FileWrites Include="$(StaticWebAssetDevelopmentManifestPath)" />

src/StaticWebAssetsSdk/Tasks/GenerateStaticWebAssetsDevelopmentManifest.cs

@@ -13,6 +13,8 @@ namespace Microsoft.AspNetCore.StaticWebAssets.Tasks
     // is case insensitive.
     public class GenerateStaticWebAssetsDevelopmentManifest : Task
     {
+        private static readonly char[] _separator = ['/'];
+        
         [Required]
         public string Source { get; set; }
 
@@ -62,10 +64,32 @@ public StaticWebAssetsDevelopmentManifest ComputeDevelopmentManifest(
             IEnumerable<StaticWebAssetsDiscoveryPattern> discoveryPatterns)
         {
             var assetsWithPathSegments = ComputeManifestAssets(assets).ToArray();
+            Array.Sort(assetsWithPathSegments);
 
             var discoveryPatternsByBasePath = discoveryPatterns
                 .GroupBy(p => p.HasSourceId(Source) ? "" : p.BasePath,
-                 (key, values) => (key.Split(new[] { '/' }, options: StringSplitOptions.RemoveEmptyEntries), values));
+                 (key, values) =>
+                    (key.Split(_separator, options: StringSplitOptions.RemoveEmptyEntries),
+                    values.OrderBy(id => id.ContentRoot).ThenBy(id => id.Pattern).ToArray())).ToArray();
+
+            Array.Sort(discoveryPatternsByBasePath, (x, y) =>
+            {
+                var lengthResult = x.Item1.Length.CompareTo(y.Item1.Length);
+                if (lengthResult != 0)
+                {
+                    return lengthResult;
+                }
+                for (var i = 0; i < x.Item1.Length; i++)
+                {
+                    var comparison = x.Item1[i].CompareTo(y.Item1[i]);
+                    if (comparison != 0)
+                    {
+                        return comparison;
+                    }
+                }
+
+                return 0;
+            });
 
             var manifest = CreateManifest(assetsWithPathSegments, discoveryPatternsByBasePath);
             return manifest;
@@ -133,7 +157,7 @@ private void PersistManifest(StaticWebAssetsDevelopmentManifest manifest)
 
         private StaticWebAssetsDevelopmentManifest CreateManifest(
             SegmentsAssetPair[] assetsWithPathSegments,
-            IEnumerable<(string[], IEnumerable<StaticWebAssetsDiscoveryPattern> values)> discoveryPatternsByBasePath)
+            (string[], StaticWebAssetsDiscoveryPattern[] values)[] discoveryPatternsByBasePath)
         {
             var contentRootIndex = new Dictionary<string, int>();
             var root = new StaticWebAssetNode() { };
@@ -326,18 +350,39 @@ public class StaticWebAssetNode
             public StaticWebAssetPattern[] Patterns { get; set; }
         }
 
-        private struct SegmentsAssetPair
+        private struct SegmentsAssetPair : IComparable<SegmentsAssetPair>
         {
+            private static readonly char[] separator = ['/'];
+
             public SegmentsAssetPair(string path, StaticWebAsset asset)
             {
-                PathSegments = path.Split(new[] { '/' }, options: StringSplitOptions.RemoveEmptyEntries);
+                PathSegments = path.Split(separator, options: StringSplitOptions.RemoveEmptyEntries);
                 Asset = asset;
             }
 
             public string[] PathSegments { get; }
 
             public StaticWebAsset Asset { get; }
 
+            public int CompareTo(SegmentsAssetPair other)
+            {
+                if (PathSegments.Length != other.PathSegments.Length)
+                {
+                    return PathSegments.Length.CompareTo(other.PathSegments.Length);
+                }
+
+                for (var i = 0; i < PathSegments.Length; i++)
+                {
+                    var comparison = PathSegments[i].CompareTo(other.PathSegments[i]);
+                    if (comparison != 0)
+                    {
+                        return comparison;
+                    }
+                }
+
+                return 0;
+            }
+
             public void Deconstruct(out string[] segments, out StaticWebAsset asset)
             {
                 asset = Asset;

test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/GenerateStaticWebAssetsDevelopmentManifestTest.cs

@@ -540,8 +540,8 @@ public void ComputeDevelopmentManifest_CanMapMultiplePatternsOnSameNodeWithDiffe
                 CreateIntermediateNode(
                     ("_other", CreateIntermediateNode(
                         ("_project", CreateIntermediateNode().AddPatterns(
-                            (0, "*.js", 2),
-                            (1, "*.css", 2)))))),
+                            (0, "*.css", 2),
+                            (1, "*.js", 2)))))),
                 Path.GetFullPath("wwwroot"),
                 Path.GetFullPath("styles"));
 

test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssetsIntegrationTest.cs

@@ -692,7 +692,7 @@ public void BuildProjectWithReferences_NoDependencies_GeneratesJsonManifestAndCo
 
             // Second build
             var secondBuild = CreateBuildCommand(ProjectDirectory, "AppWithPackageAndP2PReference");
-            secondBuild.Execute("/p:BuildProjectReferences=false").Should().Pass();
+            ExecuteCommand(secondBuild,"/p:BuildProjectReferences=false").Should().Pass();
 
             // GenerateStaticWebAssetsManifest should generate the manifest file.
             new FileInfo(path).Should().Exist();