Merge branch 'main' into darc-main-4def985b-323a-4bc9-81dc-c5c9ebfd4bd7

dotnet · Sep 1, 2024 · 1d437da · 1d437da
2 parents 93a3236 + f271b05
commit 1d437da
Show file tree

Hide file tree

Showing 16 changed files with 1,160 additions and 879 deletions.
diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Design.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.Design.targets
@@ -0,0 +1,68 @@
+<Project>
+  <PropertyGroup>
+    <CollectUpToDateCheckInputDesignTimeDependsOn>
+      $(CollectUpToDateCheckInputDesignTimeDependsOn);
+      ResolveStaticWebAssetsConfiguration;
+      ResolveProjectStaticWebAssets;
+      CollectStaticWebAssetInputsDesignTime;
+    </CollectUpToDateCheckInputDesignTimeDependsOn>
+    <CollectUpToDateCheckOutputDesignTimeDependsOn>
+      $(CollectUpToDateCheckOutputDesignTimeDependsOn);
+      ResolveStaticWebAssetsConfiguration;
+      CollectStaticWebAssetOutputsDesignTime;
+    </CollectUpToDateCheckOutputDesignTimeDependsOn>
+  </PropertyGroup>
+
+  <Target Name="CollectStaticWebAssetInputsDesignTime">
+
+    <ReadLinesFromFile
+      File="$(StaticWebAssetUpToDateCheckManifestPath)"
+      Condition="Exists('$(StaticWebAssetUpToDateCheckManifestPath)')"
+    >
+      <Output TaskParameter="Lines" ItemName="_StaticWebAssetUpToDateCheckInput" />
+    </ReadLinesFromFile>
+
+    <ReadLinesFromFile
+      File="$(StaticWebAssetReferencesUpToDateCheckManifestPath)"
+      Condition="Exists('$(StaticWebAssetReferencesUpToDateCheckManifestPath)')"
+    >
+      <Output TaskParameter="Lines" ItemName="_StaticWebAssetReferenceUpToDateCheckInput" />
+    </ReadLinesFromFile>
+
+    <ItemGroup>
+      <_UpToDateCheckStaticWebAssetResolved Include="@(StaticWebAsset)" Condition="'%(SourceType)' == 'Discovered'" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <_UpToDateCheckStaticWebAssetResolvedCandidate Include="@(_UpToDateCheckStaticWebAssetResolved->'%(OriginalItemSpec)')" />
+      <_StaticWebAssetUpToDateCheckInput Include="@(_UpToDateCheckStaticWebAssetResolvedCandidate->Distinct()->'%(FullPath)')" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <_ExistingStaticWebAssetUpToDateCheckInput Include="%(_StaticWebAssetUpToDateCheckInput.FullPath)" Condition="Exists('%(_StaticWebAssetUpToDateCheckInput.FullPath)')" />
+      <_NonExistingStaticWebAssetUpToDateCheckInput Include="%(_StaticWebAssetUpToDateCheckInput.FullPath)" Condition="!Exists('%(_StaticWebAssetUpToDateCheckInput.FullPath)')" />
+    </ItemGroup>
+
+    <WriteLinesToFile
+      File="$(StaticWebAssetUpToDateCheckRemovedManifestPath)"
+      Lines="@(_NonExistingStaticWebAssetUpToDateCheckInput)"
+      Overwrite="true"
+      WriteOnlyWhenDifferent="true" />
+
+    <ItemGroup>
+      <UpToDateCheckInput Condition="'@(_NonExistingStaticWebAssetUpToDateCheckInput)' != ''" Include="$(StaticWebAssetUpToDateCheckRemovedManifestPath)" Set="StaticWebAssets" />
+      <UpToDateCheckInput Include="@(_ExistingStaticWebAssetUpToDateCheckInput)" Set="StaticWebAssets" />
+      <UpToDateCheckInput Include="@(_StaticWebAssetReferenceUpToDateCheckInput)" Set="StaticWebAssets" />
+    </ItemGroup>
+
+  </Target>
+
+  <Target Name="CollectStaticWebAssetOutputsDesignTime">
+
+    <ItemGroup>
+      <UpToDateCheckOutput Include="$(StaticWebAssetBuildManifestPath)" Set="StaticWebAssets" />
+    </ItemGroup>
+
+  </Target>
+
+</Project>
diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.References.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.References.targets
@@ -46,6 +46,16 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="TargetOutputs" ItemName="_ReferencedProjectsConfiguration" />
     </MSBuild>
 
+    <ItemGroup Condition="'$(BuildingInsideVisualStudio)' == 'true'">
+      <_ReferenceManifestPath Include="@(_ReferencedProjectsConfiguration->'%(BuildManifestPath)')" Condition="'%(_ReferencedProjectsConfiguration.BuildManifestPath)' != ''" />
+    </ItemGroup>
+
+    <WriteLinesToFile Condition="'$(BuildingInsideVisualStudio)' == 'true'"
+      File="$(StaticWebAssetReferencesUpToDateCheckManifestPath)"
+      Lines="@(_ReferenceManifestPath)"
+      Overwrite="false"
+      WriteOnlyWhenDifferent="true" />
+
     <MergeConfigurationProperties
       CandidateConfigurations="@(_ReferencedProjectsConfiguration)"
       ProjectReferences="@(_StaticWebAssetProjectReference)">
@@ -85,6 +95,8 @@ Copyright (c) .NET Foundation. All rights reserved.
           <GetPublishAssetsTargets>$(StaticWebAssetsGetPublishAssetsTargets)</GetPublishAssetsTargets>
           <AdditionalPublishProperties>$(StaticWebAssetsAdditionalPublishProperties)</AdditionalPublishProperties>
           <AdditionalPublishPropertiesToRemove>$(StaticWebAssetsAdditionalPublishPropertiesToRemove)</AdditionalPublishPropertiesToRemove>
+          <!-- Build manifest -->
+          <BuildManifestPath>$([System.IO.Path]::GetFullPath('$(StaticWebAssetBuildManifestPath)'))</BuildManifestPath>
         </_StaticWebAssetThisProjectConfiguration>
       </ItemGroup>
   </Target>

diff --git a/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets b/src/StaticWebAssetsSdk/Targets/Microsoft.NET.Sdk.StaticWebAssets.targets
@@ -101,7 +101,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.FilterStaticWebAssetEndpoints"
     AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
     Condition="'$(StaticWebAssetsSdkBuildTasksAssembly)' != ''" />
-  
+
   <UsingTask
     TaskName="Microsoft.AspNetCore.StaticWebAssets.Tasks.UpdateStaticWebAssetEndpoints"
     AssemblyFile="$(StaticWebAssetsSdkBuildTasksAssembly)"
@@ -285,7 +285,8 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!-- For preview only, to ease in the new implementation -->
     <PrepareForRunDependsOn>StaticWebAssetsPrepareForRun;$(PrepareForRunDependsOn)</PrepareForRunDependsOn>
 
-    <StaticWebAssetsPrepareForRunDependsOn>$(StaticWebAssetsPrepareForRunDependsOn);ResolveBuildStaticWebAssets;GenerateStaticWebAssetsManifest;CopyStaticWebAssetsToOutputDirectory</StaticWebAssetsPrepareForRunDependsOn>
+    <StaticWebAssetsPrepareForRunDependsOn>$(StaticWebAssetsPrepareForRunDependsOn);ResolveBuildStaticWebAssets;GenerateStaticWebAssetsManifest;CopyStaticWebAssetsToOutputDirectory;</StaticWebAssetsPrepareForRunDependsOn>
+    <StaticWebAssetsPrepareForRunDependsOn Condition="'$(BuildingInsideVisualStudio)' == 'true'">$(StaticWebAssetsPrepareForRunDependsOn);WriteStaticWebAssetsUpToDateCheck;</StaticWebAssetsPrepareForRunDependsOn>
 
     <!-- This is a hook for features like scoped CSS and Blazor can ensure all the assets have been generated -->
     <GenerateComputedBuildStaticWebAssetsDependsOn>ResolveCoreStaticWebAssets;$(GenerateComputedBuildStaticWebAssetsDependsOn)</GenerateComputedBuildStaticWebAssetsDependsOn>
@@ -457,6 +458,11 @@ Copyright (c) .NET Foundation. All rights reserved.
       <_StaticWebAssetsGeneratedBuildPropsFileImportPath>..\build\$(PackageId).props</_StaticWebAssetsGeneratedBuildPropsFileImportPath>
       <_StaticWebAssetsGeneratedBuildMultiTargetingPropsFileImportPath>..\buildMultiTargeting\$(PackageId).props</_StaticWebAssetsGeneratedBuildMultiTargetingPropsFileImportPath>
 
+      <!-- Design -->
+      <StaticWebAssetUpToDateCheckManifestPath>$(_StaticWebAssetsManifestBase)staticwebassets.upToDateCheck.txt</StaticWebAssetUpToDateCheckManifestPath>
+      <StaticWebAssetReferencesUpToDateCheckManifestPath>$(_StaticWebAssetsManifestBase)staticwebassets.references.upToDateCheck.txt</StaticWebAssetReferencesUpToDateCheckManifestPath>
+      <StaticWebAssetUpToDateCheckRemovedManifestPath>$(_StaticWebAssetsManifestBase)staticwebassets.removed.txt</StaticWebAssetUpToDateCheckRemovedManifestPath>
+
     </PropertyGroup>
 
     <MakeDir
@@ -528,6 +534,39 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
+  <Target Name="WriteStaticWebAssetsUpToDateCheck" DependsOnTargets="_BuildCopyStaticWebAssetsPreserveNewest;_BuildCopyStaticWebAssetsAlways">
+
+    <ItemGroup>
+      <_UpToDateCheckStaticWebAssetCandidate Include="@(StaticWebAsset)" Condition="'%(SourceType)' == 'Discovered'" />
+    </ItemGroup>
+
+    <ComputeReferenceStaticWebAssetItems
+      Assets="@(_UpToDateCheckStaticWebAssetCandidate)"
+      Patterns="@(DiscoveryPattern)"
+      ProjectMode="$(StaticWebAssetProjectMode)"
+      AssetKind="Build"
+      Source="$(PackageId)"
+    >
+      <Output TaskParameter="StaticWebAssets" ItemName="_UpToDateCheckStaticWebAssetResolved" />
+    </ComputeReferenceStaticWebAssetItems>
+
+    <ItemGroup>
+      <_UpToDateCheckStaticWebAssetResolvedCandidate Include="@(_UpToDateCheckStaticWebAssetResolved->'%(OriginalItemSpec)')" />
+      <_UpToDateCheckStaticWebAsset Include="@(_UpToDateCheckStaticWebAssetResolvedCandidate->Distinct())" />
+    </ItemGroup>
+
+    <WriteLinesToFile
+      File="$(StaticWebAssetUpToDateCheckManifestPath)"
+      Lines="@(_UpToDateCheckStaticWebAsset)"
+      Overwrite="true"
+      WriteOnlyWhenDifferent="true"
+      Condition="'@(_UpToDateCheckStaticWebAsset)' != ''" />
+
+    <ItemGroup>
+      <FileWrites Include="$(StaticWebAssetUpToDateCheckManifestPath)" />
+    </ItemGroup>
+  </Target>
+
   <Target Name="AddStaticWebAssetsManifest" DependsOnTargets="ResolveStaticWebAssetsConfiguration">
     <ItemGroup>
       <ContentWithTargetPath Condition="Exists('$(StaticWebAssetDevelopmentManifestPath)')"
@@ -607,7 +646,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
-
   <Target Name="ResolveCoreStaticWebAssets" DependsOnTargets="$(ResolveCoreStaticWebAssetsDependsOn)" />
 
   <Target Name="ResolveStaticWebAssetsInputs" DependsOnTargets="$(ResolveStaticWebAssetsInputsDependsOn)" />
@@ -656,7 +694,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </Target>
 
-  <Target Name="UpdateExistingPackageStaticWebAssets">
+  <Target Name="UpdateExistingPackageStaticWebAssets" Condition="$(DesignTimeBuild) != 'true'">
     <UpdatePackageStaticWebAssets Assets="@(StaticWebAsset)">
       <Output TaskParameter="UpdatedAssets" ItemName="_UpdatedPackageAssets" />
       <Output TaskParameter="OriginalAssets" ItemName="_OriginalPackageAssets" />
@@ -672,6 +710,8 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Project="Microsoft.NET.Sdk.StaticWebAssets.References.targets" />
 
+  <Import Project="Microsoft.NET.Sdk.StaticWebAssets.Design.targets" Condition="'$(DesignTimeBuild)' == 'true' and '$(BuildingInsideVisualStudio)' == 'true'" />
+
   <Import Project="Microsoft.NET.Sdk.StaticWebAssets.EmbeddedAssets.targets" />
 
   <Import Project="Microsoft.NET.Sdk.StaticWebAssets.Pack.targets" />

diff --git a/src/StaticWebAssetsSdk/Tasks/Data/ContentTypeProvider.cs b/src/StaticWebAssetsSdk/Tasks/Data/ContentTypeProvider.cs
@@ -26,9 +26,9 @@ internal class ContentTypeProvider(ContentTypeMapping[] customMappings)
             [".htm"] = new ContentTypeMapping("text/html", null, "*.htm", 1),
             [".wasm"] = new ContentTypeMapping("application/wasm", null, "*.wasm", 1),
             [".txt"] = new ContentTypeMapping("text/plain", null, "*.txt", 1),
-            [".dll"] = new ContentTypeMapping("application/octect-stream", null, "*.dll", 1),
-            [".pdb"] = new ContentTypeMapping("application/octect-stream", null, "*.pdb", 1),
-            [".dat"] = new ContentTypeMapping("application/octect-stream", null, "*.dat", 1),
+            [".dll"] = new ContentTypeMapping("application/octet-stream", null, "*.dll", 1),
+            [".pdb"] = new ContentTypeMapping("application/octet-stream", null, "*.pdb", 1),
+            [".dat"] = new ContentTypeMapping("application/octet-stream", null, "*.dat", 1),
             [".webmanifest"] = new ContentTypeMapping("application/manifest+json", null, "*.webmanifest", 1),
             [".jsx"] = new ContentTypeMapping("text/jscript", null, "*.jsx", 1),
             [".markdown"] = new ContentTypeMapping("text/markdown", null, "*.markdown", 1),

diff --git a/...GenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json b/...GenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest.Build.staticwebassets.json
@@ -15798,7 +15798,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -16094,7 +16094,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -16131,7 +16131,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -16168,7 +16168,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -35383,7 +35383,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -35434,7 +35434,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -36183,7 +36183,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -36234,7 +36234,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -36283,7 +36283,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -36334,7 +36334,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -36383,7 +36383,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",
@@ -36434,7 +36434,7 @@
         },
         {
           "Name": "Content-Type",
-          "Value": "application/octect-stream"
+          "Value": "application/octet-stream"
         },
         {
           "Name": "ETag",