From 3c6dc1c516f2312178ceb440abebc958757316b5 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 26 Nov 2019 16:42:55 -0800
Subject: [PATCH] Try different MSBuild things to make build work (#17427)

Fixes https://github.com/aspnet/AspNetCore/issues/17418
---
 .../Blazor/Build/src/ReferenceFromSource.props        | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Components/Blazor/Build/src/ReferenceFromSource.props b/src/Components/Blazor/Build/src/ReferenceFromSource.props
index 884ddbad7a..37e2b60e16 100644
--- a/src/Components/Blazor/Build/src/ReferenceFromSource.props
+++ b/src/Components/Blazor/Build/src/ReferenceFromSource.props
@@ -20,6 +20,14 @@
     <Reference Include="Microsoft.AspNetCore.Blazor.Mono" />
   </ItemGroup>
 
+  <Target Name="_BuildBlazorBuildProject" BeforeTargets="ResolveProjectReferences">
+    <!--
+      The Blazor.Build project cross-compiles and we need the output of all TFMs to be available in the build output.
+      We can't represent this in any good way using ProjectReference elements, but we can try and build it instead.
+    -->
+    <MSBuild Projects="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.Blazor.Build.csproj" />
+  </Target>
+
   <!-- This is used as a P2P when building the repo. Normal Blazor projects will get this as a reference through the Blazor.Build package -->
   <ItemGroup>
     <!-- Ensures these projects are built before the consuming project, but without
@@ -27,9 +35,8 @@
          given that the packed version of this project wouldn't add a .dll reference) -->
     <ProjectReference Include="$(MSBuildThisFileDirectory)Microsoft.AspNetCore.Blazor.Build.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-      <!-- Optimization. Do not require framework compatibility between these projects. -->
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-      <UndefineProperties>TargetFramework</UndefineProperties>
+      <Properties>TargetFramework=$(DefaultNetCoreTargetFramework)</Properties>
     </ProjectReference>
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\DevServer\src\Microsoft.AspNetCore.Blazor.DevServer.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>