From 41a958835332c537fbd083cbfc693f7aefc1d9b7 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Fri, 3 Apr 2020 09:04:38 -0700
Subject: [PATCH] Move specifying default Blazor linker config to props file
 (#20458)

Fixes #20443
---
 .../WebAssembly/Build/src/targets/Blazor.MonoRuntime.props    | 4 ++++
 .../WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets  | 4 +---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.props b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.props
index c25b1a02b6..84031fb5e8 100644
--- a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.props
+++ b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.props
@@ -12,4 +12,8 @@
     <_BlazorBootJsonName>blazor.boot.json</_BlazorBootJsonName>
   </PropertyGroup>
 
+  <ItemGroup>
+    <BlazorLinkerDescriptor Include="$(_BlazorBuiltInBclLinkerDescriptor)" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
index b0aa8bb89c..9f24026634 100644
--- a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
+++ b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
@@ -179,8 +179,7 @@
   <UsingTask TaskName="BlazorCreateRootDescriptorFile" AssemblyFile="$(_BlazorTasksPath)" />
   <Target Name="_GenerateBlazorLinkerDescriptor"
           Inputs="@(IntermediateAssembly)"
-          Outputs="$(_GeneratedBlazorLinkerDescriptor)"
-          Condition="'@(BlazorLinkerDescriptor)' == ''">
+          Outputs="$(_GeneratedBlazorLinkerDescriptor)">
 
     <!-- Generate linker descriptors if the project doesn't explicitly provide one. -->
 
@@ -191,7 +190,6 @@
     <ItemGroup>
       <FileWrites Include="$(_GeneratedBlazorLinkerDescriptor)" />
       <BlazorLinkerDescriptor Include="$(_GeneratedBlazorLinkerDescriptor)" />
-      <BlazorLinkerDescriptor Include="$(_BlazorBuiltInBclLinkerDescriptor)" />
     </ItemGroup>
   </Target>