Merge pull request dotnet#23321 from dotnet-maestro-bot/merge/release/5.0-preview7-to-master

[automated] Merge branch 'release/5.0-preview7' => 'master'

Author: jkotalik

src/Components/Web.JS/dist/Release/blazor.server.js

@@ -56,16 +56,18 @@ async function boot(userOptions?: Partial<CircuitStartOptions>): Promise<void> {
     return true;
   };
 
-  window.addEventListener(
-    'unload',
-    () => {
+  let disconnectSent = false;
+  const cleanup = () => {
+    if (!disconnectSent) {
       const data = new FormData();
       const circuitId = circuit.circuitId!;
       data.append('circuitId', circuitId);
-      navigator.sendBeacon('_blazor/disconnect', data);
-    },
-    false
-  );
+      disconnectSent = navigator.sendBeacon('_blazor/disconnect', data);
+    }
+  };
+
+  window.addEventListener('beforeunload', cleanup, { capture: false, once: true });
+  window.addEventListener('unload', cleanup, { capture: false, once: true });
 
   window['Blazor'].reconnect = reconnect;
 

src/Components/Web.JS/src/Boot.Server.ts

@@ -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

src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/LinkerWorkaround.xml

@@ -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"

src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.ServiceWorkerAssetsManifest.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>