From b45c32fa5b3c18577a32cd4366ad7b013c9c2f28 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Wed, 29 May 2019 13:06:38 -0700
Subject: [PATCH] Add support for source-build (dotnet/aspnetcore-tooling#620)

\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/986c224acf1d8a5c351a88259904e381ef1e296b
---
 .../Microsoft.AspNetCore.Components.Razor.Extensions.csproj   | 2 ++
 .../test/Microsoft.NET.Sdk.Razor.Test.csproj                  | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
index a690a69a9d..88ee6cf430 100644
--- a/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
+++ b/src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/Microsoft.AspNetCore.Components.Razor.Extensions.csproj
@@ -6,6 +6,8 @@
     <RootNamespace>Microsoft.AspNetCore.Components.Razor</RootNamespace>
     <Description>Extensions to the Razor compiler to support building Razor Components.</Description>
     <IsProductPackage>true</IsProductPackage>
+    <!-- Excluded because this assembly has a 3rd party dependency. -->
+    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
 
     <!-- Copy package references to output, needed so the build project can find them -->
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
index b3097334e7..ac9c318068 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/Microsoft.NET.Sdk.Razor.Test.csproj
@@ -63,7 +63,7 @@
     <MSBuildLocationFileOutput>$(IntermediateOutputPath)BuildVariables.generated.cs</MSBuildLocationFileOutput>
   </PropertyGroup>
 
-  <Target 
+  <Target
     Name="GenerateMSBuildLocationFile"
     Condition="'$(TargetFramework)'!=''"
     AfterTargets="BeforeBuild"
@@ -107,7 +107,7 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
   </Target>
 
-  <Target Name="RestoreTestProjects" BeforeTargets="Restore;Build">
+  <Target Name="RestoreTestProjects" BeforeTargets="Restore;Build" Condition="'$(DotNetBuildFromSource)' != 'true'">
     <MSBuild Projects="..\testapps\RestoreTestProjects\RestoreTestProjects.csproj" Targets="Restore" />
   </Target>