From 500bdc1fd42ba0bdd3058006a6275db1be8166b4 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Mon, 7 Jan 2019 15:09:56 -0800
Subject: [PATCH] Exclude RazorComponent items from RazorGenerate item group

Interim solution to allow components to share the .cshtml extension. When declared in
the project file, the SDK will prevent RazorComponent items from being included
in the RazorGenerate itemgroup.
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/92e2c70b699a35b1410b80863aa0c3415aa0bbc6
---
 .../Sdk.Razor.CurrentVersion.targets          |  5 +++-
 .../test/IntegrationTests/Assert.cs           | 26 ++++++++++++++++---
 .../BuildWithComponentsIntegrationTest.cs     |  2 ++
 .../ComponentLibrary/ComponentLibrary.csproj  | 15 -----------
 .../Components/Counter.cshtml                 |  1 +
 .../MvcWithComponents.csproj                  |  4 +++
 6 files changed, 34 insertions(+), 19 deletions(-)
 create mode 100644 src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index 704b14d22a..a4cb71a514 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -367,7 +367,10 @@ Copyright (c) .NET Foundation. All rights reserved.
     </ItemGroup>
 
     <ItemGroup Condition="'$(EnableDefaultRazorGenerateItems)'=='true'">
-      <RazorGenerate Include="@(Content)" Condition="'%(Content.Extension)'=='.cshtml'" />
+      <RazorGenerate
+        Include="@(Content)"
+        Exclude="@(RazorComponent)"
+        Condition="'%(Content.Extension)'=='.cshtml'" />
     </ItemGroup>
 
     <!--
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
index 273c90ddda..d94289e180 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/Assert.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -384,18 +385,37 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
             }
 
             assemblyPath = Path.Combine(result.Project.DirectoryPath, Path.Combine(assemblyPath));
+
+            var typeNames = GetDeclaredTypeNames(assemblyPath);
+            Assert.Contains(fullTypeName, typeNames);
+        }
+
+        public static void AssemblyDoesNotContainType(MSBuildResult result, string assemblyPath, string fullTypeName)
+        {
+            if (result == null)
+            {
+                throw new ArgumentNullException(nameof(result));
+            }
+
+            var typeNames = GetDeclaredTypeNames(assemblyPath);
+            Assert.DoesNotContain(fullTypeName, typeNames);
+        }
+
+        private static IEnumerable<string> GetDeclaredTypeNames(string assemblyPath)
+        {
+            IEnumerable<string> typeNames;
             using (var file = File.OpenRead(assemblyPath))
             {
                 var peReader = new PEReader(file);
                 var metadataReader = peReader.GetMetadataReader();
-                var typeNames = metadataReader.TypeDefinitions.Where(t => !t.IsNil).Select(t =>
+                typeNames = metadataReader.TypeDefinitions.Where(t => !t.IsNil).Select(t =>
                 {
                     var type = metadataReader.GetTypeDefinition(t);
                     return metadataReader.GetString(type.Namespace) + "." + metadataReader.GetString(type.Name);
                 });
-
-                Assert.Contains(fullTypeName, typeNames);
             }
+
+            return typeNames;
         }
 
         private abstract class MSBuildXunitException : Xunit.Sdk.XunitException
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
index a12945f1f0..4ce8344550 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/test/IntegrationTests/BuildWithComponentsIntegrationTest.cs
@@ -36,6 +36,8 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
 
             Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.TestComponent");
             Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Views.Shared.NavMenu");
+            Assert.AssemblyContainsType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Components.Counter");
+            Assert.AssemblyDoesNotContainType(result, Path.Combine(OutputPath, "MvcWithComponents.dll"), "MvcWithComponents.Views.Home.Index");
         }
     }
 }
diff --git a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
index 631a4c0a46..f4cf248c2b 100644
--- a/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
+++ b/src/Razor/test/testassets/ComponentLibrary/ComponentLibrary.csproj
@@ -27,28 +27,13 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
   </ItemGroup>
 
-  <!-- 
-    BEGIN COMPONENT .cshtml WORKAROUND
-
-    This is the current workaround used by the components codebase to treat .cshtml files as components
-    so that we can have tooling support. Testing it here so it won't break.
-  -->
   <ItemGroup>
     <RazorComponent Include="@(Content->WithMetadataValue('Extension', '.cshtml'))" />
   </ItemGroup>
 
-  <Target Name="_RemoveFilesFromRazorGenerate" AfterTargets="ResolveRazorGenerateInputs">
-    <ItemGroup>
-      <RazorGenerate Remove="@(RazorGenerate)" />
-    </ItemGroup>
-  </Target>
-
   <ItemGroup>
     <ProjectCapability Include="DotNetCoreRazorConfiguration" />
   </ItemGroup>
-  <!--
-    END COMPONENT .cshtml WORKAROUND
-  -->
 
   <!-- Test Placeholder -->
 
diff --git a/src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml b/src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml
new file mode 100644
index 0000000000..f8b81d88c7
--- /dev/null
+++ b/src/Razor/test/testassets/MvcWithComponents/Components/Counter.cshtml
@@ -0,0 +1 @@
+This file should produce a component
diff --git a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
index c50aefcff5..1d3cf1b9ed 100644
--- a/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
+++ b/src/Razor/test/testassets/MvcWithComponents/MvcWithComponents.csproj
@@ -29,6 +29,10 @@
     <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib.dll"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <RazorComponent Include="Components/**/*.cshtml" />
+  </ItemGroup>
+
   <!-- Test Placeholder -->
 
 </Project>