From c7331565960d10d09e91150034c8e33c77572b41 Mon Sep 17 00:00:00 2001
From: Ryan Nowak <nowakra@gmail.com>
Date: Mon, 12 Feb 2018 14:02:56 -0800
Subject: [PATCH] SDK changes needed to decouple Razor from MVC

---
 .../Sdk.Razor.CurrentVersion.targets          | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index b3ce738715..2ea795e89b 100644
--- a/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -30,6 +30,7 @@ Copyright (c) .NET Foundation. All rights reserved.
   -->
   <PropertyGroup>
     <PrepareForRazorGenerateDependsOn>
+      ResolveRazorConfiguration;
       ResolveRazorGenerateInputs;
       AssignRazorGenerateTargetPaths;
       ResolveAssemblyReferenceRazorGenerateInputs;
@@ -181,6 +182,23 @@ Copyright (c) .NET Foundation. All rights reserved.
   <Target Name="RazorCompile" DependsOnTargets="$(RazorCompileDependsOn)">
   </Target>
 
+  <!-- 
+    Computes the applicable @(ResolvedRazorConfiguration) and @(ResolvedRazorExtension) items that match the project's
+    configuration. 
+  -->
+  <Target 
+    Name="ResolveRazorConfiguration"
+    Condition="'$(RazorDefaultConfiguration)'!=''">
+
+    <ItemGroup>
+      <ResolvedRazorConfiguration Include="@(RazorConfiguration)" Condition="'%(RazorConfiguration.Identity)'=='$(RazorDefaultConfiguration)'" />
+    </ItemGroup>
+
+    <FindInList List="@(RazorExtension)" ItemSpecToFind="@(RazorConfiguration->Metadata('Extensions'))">
+      <Output TaskParameter="ItemFound" ItemName="ResolvedRazorExtension" />
+    </FindInList>
+  </Target>
+
   <!--
     Generates assembly attributes in support for Razor runtime code generation. This is a set of standard
     metadata attributes (defined in Microsoft.AspNetCore.Razor.Runtime) that capture the build-time
@@ -193,19 +211,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     it will be unset by default.
   -->
   <Target 
-    Name="RazorGetAssemblyAttributes" 
+    Name="RazorGetAssemblyAttributes"
     AfterTargets="GetAssemblyAttributes"
-    Condition="'$(GenerateRazorAssemblyInfo)'=='true' and '$(RazorDefaultConfiguration)'!=''">
-
-    <ItemGroup>
-      <_ResolvedRazorConfiguration Include="@(RazorConfiguration)" Condition="'%(RazorConfiguration.Identity)'=='$(RazorDefaultConfiguration)'" />
-      <_ResolvedRazorExtensionName Include="%(_ResolvedRazorConfiguration.Extensions)"/>
-    </ItemGroup>
-
-    <FindInList List="@(RazorExtension)" ItemSpecToFind="%(_ResolvedRazorExtensionName.Identity)">
-      <Output TaskParameter="ItemFound" ItemName="_ResolvedRazorExtension" />
-    </FindInList>
-
+    Condition="'$(GenerateRazorAssemblyInfo)'=='true' and '$(RazorDefaultConfiguration)'!=''"
+    DependsOnTargets="ResolveRazorConfiguration">
     <ItemGroup>
       <AssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorLanguageVersionAttribute">
         <_Parameter1>$(RazorLangVersion)</_Parameter1>
@@ -213,9 +222,9 @@ Copyright (c) .NET Foundation. All rights reserved.
       <AssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorConfigurationNameAttribute">
         <_Parameter1>$(RazorDefaultConfiguration)</_Parameter1>
       </AssemblyAttribute>
-      <AssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute" Condition="'%(_ResolvedRazorExtension.AssemblyName)'!=''">
-        <_Parameter1>%(_ResolvedRazorExtension.Identity)</_Parameter1>
-        <_Parameter2>%(_ResolvedRazorExtension.AssemblyName)</_Parameter2>
+      <AssemblyAttribute Include="Microsoft.AspNetCore.Razor.Hosting.RazorExtensionAssemblyNameAttribute" Condition="'%(ResolvedRazorExtension.AssemblyName)'!=''">
+        <_Parameter1>%(ResolvedRazorExtension.Identity)</_Parameter1>
+        <_Parameter2>%(ResolvedRazorExtension.AssemblyName)</_Parameter2>
       </AssemblyAttribute>
     </ItemGroup>