Cleanups and test fixes

Author: javiercn

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

@@ -238,16 +238,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <_CompressionCurrentProjectBuildAssets Include="@(StaticWebAsset)" />
     </ItemGroup>
 
-    <!-- <ComputeStaticWebAssetsForCurrentProject
-      Assets="@(StaticWebAsset)"
-      ProjectMode="$(StaticWebAssetProjectMode)"
-      AssetKind="Build"
-      IncludeReferenceAssets="true"
-      Source="$(PackageId)"
-    >
-      <Output TaskParameter="StaticWebAssets" ItemName="_CompressionCurrentProjectBuildAssets" />
-    </ComputeStaticWebAssetsForCurrentProject> -->
-
     <ApplyCompressionNegotiation
       CandidateEndpoints="@(StaticWebAssetEndpoint)"
       CandidateAssets="@(_CompressionCurrentProjectBuildAssets)"
@@ -330,16 +320,6 @@ Copyright (c) .NET Foundation. All rights reserved.
       <_CompressionCurrentProjectPublishAssets Include="@(StaticWebAsset)" Condition="'%(AssetKind)' != 'Build'" />
     </ItemGroup>
 
-    <!-- <ComputeStaticWebAssetsForCurrentProject
-      Assets="@(StaticWebAsset)"
-      ProjectMode="$(StaticWebAssetProjectMode)"
-      AssetKind="Publish"
-      IncludeReferenceAssets="true"
-      Source="$(PackageId)"
-    >
-      <Output TaskParameter="StaticWebAssets" ItemName="_CompressionCurrentProjectPublishAssets" />
-    </ComputeStaticWebAssetsForCurrentProject> -->
-
     <ApplyCompressionNegotiation
       CandidateEndpoints="@(StaticWebAssetEndpoint)"
       CandidateAssets="@(_CompressionCurrentProjectPublishAssets)"

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

@@ -27,15 +27,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
     Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
 
- <UsingTask
-   TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.ComputeEndpointsForReferenceStaticWebAssets"
-   AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
-   Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
-
- <UsingTask
-   TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.ComputeEndpointsForCurrentProjectStaticWebAssets"
-   AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
-   Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
+  <UsingTask
+    TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.ComputeEndpointsForReferenceStaticWebAssets"
+    AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
+    Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
 
   <UsingTask
     TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.DefineStaticWebAssetEndpoints"

src/StaticWebAssetsSdk/Tasks/ComputeEndpointsForCurrentProjectStaticWebAssets.cs

@@ -16,8 +16,6 @@ public class ComputeStaticWebAssetsForCurrentProject : Task
         [Required]
         public string AssetKind { get; set; }
 
-        public bool IncludeReferenceAssets { get; set; }
-
         [Required]
         public string Source { get; set; }
 
@@ -52,7 +50,7 @@ public override bool Execute()
                         }
                     }
 
-                    if (!selected.IsForReferencedProjectsOnly() || IncludeReferenceAssets)
+                    if (!selected.IsForReferencedProjectsOnly())
                     {
                         resultAssets.Add(selected);
                     }

src/StaticWebAssetsSdk/Tasks/ComputeStaticWebAssetsForCurrentProject.cs

@@ -56,15 +56,6 @@ public override bool Execute()
             {
                 var asset = kvp.Value;
                 StaticWebAssetEndpoint endpoint = null;
-                //if (!asset.IsDiscovered() && !asset.IsComputed())
-                //{
-                //    // If the asset is not for the current project, we skip it.
-                //    // Package endpoints are already defined in the package Endpoints.props file.
-                //    // Referenced project endpoints are retrieved from the call to GetCurrentProjectBuildStaticWebAssetItems and
-                //    // GetCurrentProjectPublishStaticWebAssetItems respectively.
-                //    Log.LogMessage(MessageImportance.Low, $"Skipping asset {asset.Identity} because it is not for the current project.");
-                //    continue;
-                //}
 
                 // StaticWebAssets has this behavior where the base path for an asset only gets applied if the asset comes from a
                 // package or a referenced project and ignored if it comes from the current project.

src/StaticWebAssetsSdk/Tasks/DefineStaticWebAssetEndpoints.cs

@@ -18,22 +18,30 @@ public void Build_IsIncremental()
             var projectDirectory = CreateAspNetSdkTestAsset(testAsset);
 
             var build = new BuildCommand(projectDirectory, "blazorwasm");
-            build.Execute()
+            build.WithWorkingDirectory(projectDirectory.TestRoot);
+            build.Execute("/bl")
                 .Should()
                 .Pass();
 
             var buildOutputDirectory = build.GetOutputDirectory(DefaultTfm).ToString();
 
+            var filesToIgnore = new[]
+            {
+                Path.Combine(buildOutputDirectory, "RazorClassLibrary.staticwebassets.endpoints.json"),
+                Path.Combine(buildOutputDirectory, "blazorwasm.staticwebassets.endpoints.json")
+            };
+
             // Act
-            var thumbPrint = FileThumbPrint.CreateFolderThumbprint(projectDirectory, buildOutputDirectory);
+            var thumbPrint = FileThumbPrint.CreateFolderThumbprint(projectDirectory, buildOutputDirectory, filesToIgnore);
 
             // Assert
             for (var i = 0; i < 3; i++)
             {
                 build = new BuildCommand(projectDirectory, "blazorwasm");
-                build.Execute().Should().Pass();
+                build.WithWorkingDirectory(projectDirectory.TestRoot);
+                build.Execute($"/bl:msbuild{i}.binlog").Should().Pass();
 
-                var newThumbPrint = FileThumbPrint.CreateFolderThumbprint(projectDirectory, buildOutputDirectory);
+                var newThumbPrint = FileThumbPrint.CreateFolderThumbprint(projectDirectory, buildOutputDirectory, filesToIgnore);
                 newThumbPrint.Count.Should().Be(thumbPrint.Count);
                 for (var j = 0; j < thumbPrint.Count; j++)
                 {