From a93ff609049cc9cd805f95fe801fe81c8ed5b933 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 25 Jun 2020 08:52:53 -0700
Subject: [PATCH] SDK fixes (#23317)

* Fix up Blazor ILLink Descriptor files

1. Add the typegranularity file to TrimmerRootDescriptor.
2. Remove the application assembly descriptor file, since the application assembly is passed in as a RootAssembly already.

* Razor SDK fixups for blazor

* Only include dlls when generating type granular assemblies
* Write server-worker to the obj directory

Co-authored-by: Eric Erhardt <eric.erhardt@microsoft.com>
---
 .../src/build/netstandard2.0/LinkerWorkaround.xml  |  2 --
 ....Components.ServiceWorkerAssetsManifest.targets |  4 ++--
 ...Microsoft.NET.Sdk.Razor.Components.Wasm.targets | 14 ++------------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/LinkerWorkaround.xml b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/LinkerWorkaround.xml
index 4461d2fc12..143b01868c 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/LinkerWorkaround.xml
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/LinkerWorkaround.xml
@@ -13,8 +13,6 @@
     <type fullname="System.ComponentModel.TimeSpanConverter" />
   </assembly>
 
-  <assembly fullname="System.Runtime.InteropServices.JavaScript" preserve="all" />
-
   <assembly fullname="System.Text.Json">
     <!-- S.T.J. uses Activator.CreateInstance to instantiate converters, so we need to preserve default constructors.
     For safety, do this for all converter types, even though most of them are preserved anyway due to being referenced
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.ServiceWorkerAssetsManifest.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.ServiceWorkerAssetsManifest.targets
index 8fdef1b4b3..0fec74e225 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.ServiceWorkerAssetsManifest.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.ServiceWorkerAssetsManifest.targets
@@ -121,7 +121,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     </PropertyGroup>
 
     <ItemGroup>
-      <_ServiceWorkerIntermediatePublishFile Include="%(ServiceWorker.IntermediateOutputPath)serviceworkers\%(FileName).publish%(Extension)">
+      <_ServiceWorkerIntermediatePublishFile Include="$(IntermediateOutputPath)serviceworkers\%(FileName).publish%(Extension)">
         <ContentSourcePath Condition="'%(ServiceWorker.PublishedContent)' != ''">%(ServiceWorker.PublishedContent)</ContentSourcePath>
         <ContentSourcePath Condition="'%(ServiceWorker.PublishedContent)' == ''">%(ServiceWorker.Identity)</ContentSourcePath>
         <RelativePath>%(ServiceWorker.Identity)</RelativePath>
@@ -154,7 +154,7 @@ Copyright (c) .NET Foundation. All rights reserved.
         CopyToPublishDirectory="PreserveNewest"
         RelativePath="%(_ServiceWorkerIntermediatePublishFile.RelativePath)"
         ExcludeFromSingleFile="true" />
-      
+
       <ResolvedFileToPublish
         Include="$(_ServiceWorkerAssetsManifestPublishIntermediateOutputPath)"
         CopyToPublishDirectory="PreserveNewest"
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
index fe977ecdc0..fff9969bcb 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
@@ -307,36 +307,26 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <Target Name="_CreateBlazorTrimmerRootDescriptorFiles" BeforeTargets="ILLink" AfterTargets="ComputeResolvedFilesToPublishList">
     <PropertyGroup>
-      <_BlazorApplicationTrimmerDescriptorFile>$(IntermediateOutputPath)default.trimmerdescriptor.xml</_BlazorApplicationTrimmerDescriptorFile>
       <_BlazorTypeGranularTrimmerDescriptorFile>$(IntermediateOutputPath)typegranularity.trimmerdescriptor.xml</_BlazorTypeGranularTrimmerDescriptorFile>
     </PropertyGroup>
 
     <ItemGroup>
       <_BlazorTypeGranularAssembly
           Include="@(ResolvedFileToPublish)"
-          Condition="$([System.String]::Copy('%(Filename)').StartsWith('Microsoft.AspNetCore.')) or $([System.String]::Copy('%(Filename)').StartsWith('Microsoft.Extensions.'))">
+          Condition="'%(Extension)' == '.dll' AND ($([System.String]::Copy('%(Filename)').StartsWith('Microsoft.AspNetCore.')) or $([System.String]::Copy('%(Filename)').StartsWith('Microsoft.Extensions.')))">
         <Required>false</Required>
         <Preserve>all</Preserve>
       </_BlazorTypeGranularAssembly>
-
-      <_BlazorApplicationAssembly Include="@(IntermediateAssembly)">
-        <Required>true</Required>
-      </_BlazorApplicationAssembly>
     </ItemGroup>
 
-    <CreateBlazorTrimmerRootDescriptorFile
-      Assemblies="@(_BlazorApplicationAssembly)"
-      TrimmerFile="$(_BlazorApplicationTrimmerDescriptorFile)" />
-
     <CreateBlazorTrimmerRootDescriptorFile
       Assemblies="@(_BlazorTypeGranularAssembly)"
       TrimmerFile="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
 
     <ItemGroup>
-      <TrimmerRootDescriptor Include="$(_BlazorApplicationTrimmerDescriptorFile)" />
+      <TrimmerRootDescriptor Include="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
       <TrimmerRootDescriptor Include="$(MSBuildThisFileDirectory)LinkerWorkaround.xml" />
 
-      <FileWrites Include="$(_BlazorApplicationTrimmerDescriptorFile)" />
       <FileWrites Include="$(_BlazorTypeGranularTrimmerDescriptorFile)" />
     </ItemGroup>
   </Target>