Add TypeScript Static Web Assets integration

Directory.Packages.props

@@ -94,6 +94,7 @@
     <PackageVersion Include="Microsoft.WixToolset.Util.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" />
     <PackageVersion Include="Microsoft.WixToolset.UI.wixext" Version="$(MicrosoftWixToolsetSdkVersion)" />
     <PackageVersion Include="MSBuild.StructuredLogger" Version="2.3.45" />
+    <PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="$(MicrosoftTypeScriptMSBuildPackageVersion)" />
     <PackageVersion Include="Moq" Version="$(MoqPackageVersion)" />
     <PackageVersion Include="NETStandard.Library.NETFramework" Version="$(NETStandardLibraryNETFrameworkVersion)" />
     <PackageVersion Include="Newtonsoft.Json" Version="$(NewtonsoftJsonPackageVersion)" />

eng/Versions.props

@@ -142,6 +142,7 @@
   <PropertyGroup>
     <AwesomeAssertionsVersion>8.0.2</AwesomeAssertionsVersion>
     <AwesomeAssertionsJsonVersion>8.0.0</AwesomeAssertionsJsonVersion>
+    <MicrosoftTypeScriptMSBuildPackageVersion>5.9.3</MicrosoftTypeScriptMSBuildPackageVersion>
     <MoqPackageVersion>4.18.4</MoqPackageVersion>
     <XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
     <MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

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

@@ -0,0 +1,86 @@
+<!--
+***********************************************************************************************
+Microsoft.NET.Sdk.StaticWebAssets.TypeScript.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+Copyright (c) .NET Foundation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0">
+
+  <PropertyGroup>
+    <ResolveStaticWebAssetsInputsDependsOn>
+      RegisterTypeScriptStaticWebAssets;
+      $(ResolveStaticWebAssetsInputsDependsOn)
+    </ResolveStaticWebAssetsInputsDependsOn>
+  </PropertyGroup>
+
+  <Target Name="ResolveTypeScriptStaticWebAssetsConfiguration"
+          DependsOnTargets="ResolveStaticWebAssetsConfiguration">
+    <PropertyGroup>
+      <_TypeScriptSwaManifestPath>$(_StaticWebAssetsManifestBase)staticwebassets.typescript.files.txt</_TypeScriptSwaManifestPath>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="RegisterTypeScriptStaticWebAssets"
+          DependsOnTargets="ResolveTypeScriptStaticWebAssetsConfiguration;CompileTypeScriptWithTSConfig;GetTypeScriptOutputForPublishing">
+
+    <ItemGroup>
+      <_TypeScriptWwwrootAssets Include="@(GeneratedJavascript)"
+        Condition="$([System.String]::new('%(Identity)').Contains('wwwroot')) And Exists('%(Identity)')" />
+    </ItemGroup>
+
+    <WriteLinesToFile
+      File="$(_TypeScriptSwaManifestPath)"
+      Lines="@(_TypeScriptWwwrootAssets)"
+      Overwrite="true"
+      WriteOnlyWhenDifferent="true"
+      Condition="'@(_TypeScriptWwwrootAssets)' != ''" />
+
+    <ItemGroup>
+      <FileWrites Include="$(_TypeScriptSwaManifestPath)" />
+    </ItemGroup>
+
+    <DefineStaticWebAssets
+      Condition="'@(_TypeScriptWwwrootAssets)' != ''"
+      CandidateAssets="@(_TypeScriptWwwrootAssets)"
+      FingerprintCandidates="$(StaticWebAssetsFingerprintContent)"
+      FingerprintPatterns="@(StaticWebAssetFingerprintPattern)"
+      RelativePathPattern="wwwroot/**"
+      SourceType="Discovered"
+      SourceId="$(PackageId)"
+      ContentRoot="$(MSBuildProjectDirectory)\wwwroot\"
+      BasePath="$(StaticWebAssetBasePath)"
+      AssetMergeSource="$(StaticWebAssetMergeTarget)">
+      <Output TaskParameter="Assets" ItemName="StaticWebAsset" />
+      <Output TaskParameter="Assets" ItemName="_TypeScriptStaticWebAssets" />
+    </DefineStaticWebAssets>
+
+    <DefineStaticWebAssetEndpoints
+      Condition="'@(_TypeScriptStaticWebAssets)' != ''"
+      CandidateAssets="@(_TypeScriptStaticWebAssets)"
+      ContentTypeMappings="@(StaticWebAssetContentTypeMapping)">
+      <Output TaskParameter="Endpoints" ItemName="StaticWebAssetEndpoint" />
+    </DefineStaticWebAssetEndpoints>
+
+  </Target>
+
+  <Target Name="RemoveTypeScriptFromContentBeforeSwaDiscovery"
+          DependsOnTargets="ResolveTypeScriptStaticWebAssetsConfiguration"
+          BeforeTargets="CoreClean;ResolveProjectStaticWebAssets">
+
+    <ReadLinesFromFile File="$(_TypeScriptSwaManifestPath)"
+                       Condition="Exists('$(_TypeScriptSwaManifestPath)')">
+      <Output TaskParameter="Lines" ItemName="_RegisteredTypeScriptAssets" />
+    </ReadLinesFromFile>
+
+    <ItemGroup>
+      <Content Remove="@(_RegisteredTypeScriptAssets)" />
+    </ItemGroup>
+
+  </Target>
+
+</Project>

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

@@ -538,7 +538,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </Copy>
 
   </Target>
-  
+
   <Target Name="_BuildCopyStaticWebAssetsIfDifferent"
     AfterTargets="_SplitStaticWebAssetsByCopyOptions">
 
@@ -786,4 +786,6 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Import Project="Microsoft.NET.Sdk.StaticWebAssets.HtmlAssetPlaceholders.targets" Condition="'$(OverrideHtmlAssetPlaceholders)' == 'true'" />
 
+  <Import Project="Microsoft.NET.Sdk.StaticWebAssets.TypeScript.targets" Condition="'$(EnableTypeScriptNuGetTarget)' == 'true'" />
+
 </Project>

test/Microsoft.NET.Sdk.StaticWebAssets.Tests/Microsoft.NET.Sdk.StaticWebAssets.Tests.csproj

@@ -34,6 +34,10 @@
       <_Parameter1>DefaultTestBaselinePackageVersion</_Parameter1>
       <_Parameter2>5.0</_Parameter2>
     </AssemblyAttribute>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>MicrosoftTypeScriptMSBuildPackageVersion</_Parameter1>
+      <_Parameter2>$(MicrosoftTypeScriptMSBuildPackageVersion)</_Parameter2>
+    </AssemblyAttribute>
   </ItemGroup>
 
   <ItemGroup>